[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/arm a few more fixes (make...

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

details:   https://anonhg.NetBSD.org/src/rev/a70265f06766
branches:  trunk
changeset: 780782:a70265f06766
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Aug 06 00:24:13 2012 +0000

description:
a few more fixes (make unwinding correct for EABI)
improve link spec to with fix-v4bx and emulations
Add bpabi-netbsd.c to resolve problem with bpabi.c conflicting with bpabi.S

diffstat:

 external/gpl3/gcc/dist/gcc/config/arm/bpabi-netbsd.c |   1 +
 external/gpl3/gcc/dist/gcc/config/arm/bpabi.h        |   3 +++
 external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h  |  10 +++++++---
 external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi  |   7 +++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r 27227d42a2ea -r a70265f06766 external/gpl3/gcc/dist/gcc/config/arm/bpabi-netbsd.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/bpabi-netbsd.c      Mon Aug 06 00:24:13 2012 +0000
@@ -0,0 +1,1 @@
+#include "bpabi.c"
diff -r 27227d42a2ea -r a70265f06766 external/gpl3/gcc/dist/gcc/config/arm/bpabi.h
--- a/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h     Mon Aug 06 00:21:37 2012 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h     Mon Aug 06 00:24:13 2012 +0000
@@ -28,7 +28,10 @@
 #define TARGET_BPABI (TARGET_AAPCS_BASED)
 
 /* BPABI targets use EABI frame unwinding tables.  */
+#undef MUST_USE_SJLJ_EXCEPTIONS
 #define TARGET_UNWIND_INFO 1
+#undef ARM_EABI_UNWIND_TABLES
+#define ARM_EABI_UNWIND_TABLES 1
 
 /* Section 4.1 of the AAPCS requires the use of VFP format.  */
 #undef  FPUTYPE_DEFAULT
diff -r 27227d42a2ea -r a70265f06766 external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
--- a/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h       Mon Aug 06 00:21:37 2012 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h       Mon Aug 06 00:24:13 2012 +0000
@@ -37,9 +37,9 @@
    config.gcc for big endian configurations.  */
 #undef  TARGET_LINKER_EMULATION
 #if TARGET_ENDIAN_DEFAULT == MASK_BIG
-#define TARGET_LINKER_EMULATION "armelfb_nbsd_eabi"
+#define TARGET_LINKER_EMULATION "-m armelfb_nbsd_eabi"
 #else
-#define TARGET_LINKER_EMULATION "armelf_nbsd_eabi"
+#define TARGET_LINKER_EMULATION "-m armelf_nbsd_eabi"
 #endif
 
 #undef MULTILIB_DEFAULTS
@@ -80,11 +80,15 @@
   { "subtarget_extra_asm_spec",        SUBTARGET_EXTRA_ASM_SPEC }, \
   { "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC }, \
   { "netbsd_link_spec",                NETBSD_LINK_SPEC_ELF }, \
+  { "be8_link_spec",           BE8_LINK_SPEC }, \
+  { "target_fix_v4bx_spec",    TARGET_FIX_V4BX_SPEC }, \
   { "netbsd_entry_point",      NETBSD_ENTRY_POINT },
 
 #define NETBSD_ENTRY_POINT "__start"
 
 #undef LINK_SPEC
 #define LINK_SPEC \
-  "-X %{mbig-endian:-EB} %{mlittle-endian:-EL} \
+  "-X %{mbig-endian:-EB -m armelfb_nbsd_eabi} \
+   %{mlittle-endian:-EL -m armelf_nbsd_eabi} \
+   %(be8_link_spec) %(target_fix_v4bx_spec) \
    %(netbsd_link_spec)"
diff -r 27227d42a2ea -r a70265f06766 external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi
--- a/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi       Mon Aug 06 00:21:37 2012 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi       Mon Aug 06 00:24:13 2012 +0000
@@ -26,3 +26,10 @@
 #      _fixsfsi _fixunssfsi
 LIB1ASMFUNCS += \
        _floatundisf
+
+# Add the BPABI C functions.
+LIB2FUNCS_EXTRA = $(srcdir)/config/arm/bpabi-netbsd.c \
+                 $(srcdir)/config/arm/unaligned-funcs.c
+
+# we don't have this
+LIB2FUNCS_STATIC_EXTRA =