Module Name: src
Committed By: skrll
Date: Thu Apr 18 09:11:13 UTC 2013
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
src/external/gpl3/gcc/dist/gcc/config/arm: t-netbsd-eabi
Log Message:
Fix up arm*-*-netbsdelf-*eabi*) targets.
Remove all (most?) of the softfloat functions as they clash with the
libc versions. Also stop using t-bpapi as it adds stuff that's also in
libc. Bring in the parts of t-bpapi that we do want.
Discussed with matt@
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.16 src/external/gpl3/gcc/dist/gcc/config.gcc:1.17
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.16 Tue Feb 5 03:02:10 2013
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Thu Apr 18 09:11:13 2013
@@ -731,7 +731,7 @@ arm*-*-netbsdelf*)
arm*-*-netbsdelf-*eabi*)
tm_file="$tm_file arm/bpabi.h arm/netbsd-elf.h arm/netbsd-eabi.h"
#tmake_file="$tmake_file arm/t-arm-elf"
- tmake_file="$tmake_file arm/t-bpabi"
+ #tmake_file="$tmake_file arm/t-bpabi"
tmake_file="$tmake_file arm/t-netbsd-eabi"
# The BPABI long long divmod functions return a 128-bit value in
# registers r0-r3. Correctly modeling that requires the use of
Index: src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi:1.4 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi:1.5
--- src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi:1.4 Mon Feb 4 18:41:18 2013
+++ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi Thu Apr 18 09:11:13 2013
@@ -17,22 +17,20 @@
# <http://www.gnu.org/licenses/>.
# Use a version of div0 which raises SIGFPE, and a special __clear_cache.
-#LIB1ASMFUNCS += \
-# _ashldi3 _ashrdi3 _divdi3 _floatdidf _udivmoddi4 _umoddi3 \
-# _udivdi3 _lshrdi3 _moddi3 _muldi3 _negdi2 _cmpdi2 \
-# _fixdfdi _fixsfdi _fixunsdfdi _fixunssfdi _floatdisf \
-# _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-# _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-# _fixsfsi _fixunssfsi
-#LIB1ASMFUNCS += \
-# _floatundisf
-# Add the BPABI C functions.
-LIB2FUNCS_EXTRA = $(srcdir)/config/arm/bpabi-netbsd.c \
- $(srcdir)/config/arm/unaligned-funcs.c
+LIB1ASMFUNCS += \
+ _dvmd_tls _bb_init_func _call_via_rX _interwork_call_via_rX \
+ _clzsi2 _clzdi2
-# we don't have this
-LIB2FUNCS_STATIC_EXTRA =
+# Add the BPABI C functions that aren't already in libc
+LIB2FUNCS_EXTRA = $(srcdir)/config/arm/unaligned-funcs.c
-# to make compat easier.
-UNWIND_H = $(srcdir)/config/arm/unwind-arm.h
+LIB2FUNCS_STATIC_EXTRA =
+
+UNWIND_H = $(srcdir)/config/arm/unwind-arm.h
+LIB2ADDEH = $(srcdir)/config/arm/unwind-arm.c \
+ $(srcdir)/config/arm/libunwind.S \
+ $(srcdir)/config/arm/pr-support.c $(srcdir)/unwind-c.c
+LIB2ADDEHDEP = $(UNWIND_H) $(srcdir)/config/$(LIB1ASMSRC)
+
+SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver
