Module Name:    src
Committed By:   matt
Date:           Fri Jan 31 07:58:39 UTC 2014

Modified Files:
        src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-eabi.h

Log Message:
Fix TARGET_LINKER_EABI_SUFFIX to actually use the right suffix.  Since this
now depends on the default float-abi, pick from two strings to select the
right suffix.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
    src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h

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/arm/netbsd-eabi.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.10 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.11
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.10	Fri Aug 23 00:22:16 2013
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h	Fri Jan 31 07:58:39 2014
@@ -32,9 +32,12 @@
 #define ARM_EABI_UNWIND_TABLES \
   ((!USING_SJLJ_EXCEPTIONS && flag_exceptions) || flag_unwind_tables)
 
-#define TARGET_LINKER_EABI_SUFFIX "%{!mabi=apcs-gnu:%{!mabi=atpcs:_nbsd_eabi}}"
-#define TARGET_LINKER_BIG_EMULATION "armelfb%(linker_eabi_suffix)"
-#define TARGET_LINKER_LITTLE_EMULATION "armelf%(linker_eabi_suffix)"
+#define TARGET_LINKER_EABI_SUFFIX \
+    (TARGET_DEFAULT_FLOAT_ABI == ARM_FLOAT_ABI_SOFT \
+     ? "%{!mabi=apcs-gnu:%{!mabi=atpcs:%{mfloat-abi=hard:_eabihf;:_eabi}}}" \
+     : "%{!mabi=apcs-gnu:%{!mabi=atpcs:%{mfloat-abi=soft:_eabi;:_eabihf}}}")
+#define TARGET_LINKER_BIG_EMULATION "armelfb_nbsd%(linker_eabi_suffix)"
+#define TARGET_LINKER_LITTLE_EMULATION "armelf_nbsd%(linker_eabi_suffix)"
 
 /* TARGET_BIG_ENDIAN_DEFAULT is set in
    config.gcc for big endian configurations.  */

Reply via email to