[src/trunk]: src/external/gpl3/gcc/dist/gcc Fix up arm*-*-netbsdelf-*eabi*) t...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e855bfd4a12e
branches:  trunk
changeset: 786172:e855bfd4a12e
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Apr 18 09:11:13 2013 +0000

description:
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@

diffstat:

 external/gpl3/gcc/dist/gcc/config.gcc               |   2 +-
 external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi |  30 +++++++++-----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diffs (52 lines):

diff -r 451d4b32b977 -r e855bfd4a12e external/gpl3/gcc/dist/gcc/config.gcc
--- a/external/gpl3/gcc/dist/gcc/config.gcc     Thu Apr 18 05:20:00 2013 +0000
+++ b/external/gpl3/gcc/dist/gcc/config.gcc     Thu Apr 18 09:11:13 2013 +0000
@@ -731,7 +731,7 @@
        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
diff -r 451d4b32b977 -r e855bfd4a12e external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi
--- a/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi       Thu Apr 18 05:20:00 2013 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi       Thu Apr 18 09:11:13 2013 +0000
@@ -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
+
+LIB1ASMFUNCS += \
+       _dvmd_tls _bb_init_func _call_via_rX _interwork_call_via_rX \
+       _clzsi2 _clzdi2
+
+# Add the BPABI C functions that aren't already in libc
+LIB2FUNCS_EXTRA = $(srcdir)/config/arm/unaligned-funcs.c
 
-# Add the BPABI C functions.
-LIB2FUNCS_EXTRA = $(srcdir)/config/arm/bpabi-netbsd.c \
-                 $(srcdir)/config/arm/unaligned-funcs.c
+LIB2FUNCS_STATIC_EXTRA =
 
-# we don't have this
-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)
 
-# to make compat easier.
-UNWIND_H = $(srcdir)/config/arm/unwind-arm.h 
+SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver