From owner-svn-src-projects@FreeBSD.ORG  Mon Feb  6 08:28:45 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E3DE106566C;
	Mon,  6 Feb 2012 08:28:45 +0000 (UTC)
	(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D74998FC0C;
	Mon,  6 Feb 2012 08:28:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q168SiW6023907;
	Mon, 6 Feb 2012 08:28:44 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q168SiE1023905;
	Mon, 6 Feb 2012 08:28:44 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201202060828.q168SiE1023905@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 6 Feb 2012 08:28:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231063 - projects/arm_eabi/gnu/lib/libgcc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Feb 2012 08:28:45 -0000

Author: andrew
Date: Mon Feb  6 08:28:44 2012
New Revision: 231063
URL: http://svn.freebsd.org/changeset/base/231063

Log:
  Get libgcc_s building on ARM EABI:
  * Don't build the C version of the floating point functions as there are
    ARM specific versions.
  * Only include the required functions in LIB1ASMFUNCS.
  * Stop compiling bpabi.c as it is unneeded.

Modified:
  projects/arm_eabi/gnu/lib/libgcc/Makefile

Modified: projects/arm_eabi/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/arm_eabi/gnu/lib/libgcc/Makefile	Mon Feb  6 07:18:59 2012	(r231062)
+++ projects/arm_eabi/gnu/lib/libgcc/Makefile	Mon Feb  6 08:28:44 2012	(r231063)
@@ -52,12 +52,13 @@ LIB2FUNCS+= _fixuns${mode}si
 .endfor
 
 # Likewise double-word routines.
+.if ${TARGET_CPUARCH} != "arm"
+# These are implemented in an ARM specific file but will not be filtered out
 .for mode in sf df xf tf
 LIB2FUNCS+= _fix${mode}di _fixuns${mode}di
-.if ${TARGET_CPUARCH} != "arm"
 LIB2FUNCS+= _floatdi${mode} _floatundi${mode}
-.endif
 .endfor
+.endif
 
 LIB2ADD = $(LIB2FUNCS_EXTRA)
 LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
@@ -110,18 +111,10 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udi
 CFLAGS+=	-Dinhibit_libc -fno-inline
 LIB1ASMSRC =	lib1funcs.asm
 LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
-LIB1ASMFUNCS+=	_udivsi3 _divsi3 _umodsi3 _modsi3\
-	_call_via_rX _interwork_call_via_rX \
-	_lshrdi3 _ashrdi3 _ashldi3 \
-	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-	_fixsfsi _fixunssfsi _floatdidf _floatdisf \
-	 _aeabi_ulcmp _aeabi_ldivmod _aeabi_uldivmod
-LIB2ADDEH = unwind-arm.c libunwind.S pr-support.c unwind-c.c
-LIB2FUNCS_EXTRA = bpabi.c
+LIB1ASMFUNCS+=	_addsubdf3 _addsubsf3 _cmpdf2 _cmpsf2 _fixdfsi _fixsfsi \
+		_fixunsdfsi _fixunsdfsi _muldivdf3 _muldivsf3 _udivsi3
 
-# Make bpabi.So depend on bpabi.c and not bpabi.S
-bpabi.So: bpabi.c
+LIB2ADDEH =	unwind-arm.c libunwind.S pr-support.c unwind-c.c
 .endif
 
 .if ${TARGET_CPUARCH} == mips