ee79e7e
2012-05-01  Richard Earnshaw  <rearnsha@arm.com>
ee79e7e
ee79e7e
	* arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_DEFAULT): Avoid ifdef
ee79e7e
	comparing enumeration values.  Update comments.
ee79e7e
ee79e7e
2012-04-26  Michael Hope  <michael.hope@linaro.org>
ee79e7e
	    Richard Earnshaw  <rearnsha@arm.com>
ee79e7e
ee79e7e
	* config/arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_SOFT_FLOAT): Define.
ee79e7e
	(GLIBC_DYNAMIC_LINKER_HARD_FLOAT): Define.
ee79e7e
	(GLIBC_DYNAMIC_LINKER_DEFAULT): Define.
ee79e7e
	(GLIBC_DYNAMIC_LINKER):	Redefine to use the hard float path.
ee79e7e
ee79e7e
--- gcc/config/arm/linux-eabi.h	(revision 186858)
ee79e7e
+++ gcc/config/arm/linux-eabi.h	(revision 187012)
ee79e7e
@@ -32,7 +32,8 @@
ee79e7e
   while (false)
ee79e7e
 
ee79e7e
 /* We default to a soft-float ABI so that binaries can run on all
ee79e7e
-   target hardware.  */
ee79e7e
+   target hardware.  If you override this to use the hard-float ABI then
ee79e7e
+   change the setting of GLIBC_DYNAMIC_LINKER_DEFAULT as well.  */
ee79e7e
 #undef  TARGET_DEFAULT_FLOAT_ABI
ee79e7e
 #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT
ee79e7e
 
ee79e7e
@@ -59,10 +60,23 @@
ee79e7e
 #undef  SUBTARGET_EXTRA_LINK_SPEC
ee79e7e
 #define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION
ee79e7e
 
ee79e7e
-/* Use ld-linux.so.3 so that it will be possible to run "classic"
ee79e7e
-   GNU/Linux binaries on an EABI system.  */
ee79e7e
+/* GNU/Linux on ARM currently supports three dynamic linkers:
ee79e7e
+   - ld-linux.so.2 - for the legacy ABI
ee79e7e
+   - ld-linux.so.3 - for the EABI-derived soft-float ABI
ee79e7e
+   - ld-linux-armhf.so.3 - for the EABI-derived hard-float ABI.
ee79e7e
+   All the dynamic linkers live in /lib.
ee79e7e
+   We default to soft-float, but this can be overridden by changing both
ee79e7e
+   GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI.  */
ee79e7e
+
ee79e7e
 #undef  GLIBC_DYNAMIC_LINKER
ee79e7e
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
ee79e7e
+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
ee79e7e
+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
ee79e7e
+#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
ee79e7e
+
ee79e7e
+#define GLIBC_DYNAMIC_LINKER \
ee79e7e
+   "%{mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \
ee79e7e
+    %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
ee79e7e
+    %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
ee79e7e
 
ee79e7e
 /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
ee79e7e
    use the GNU/Linux version, not the generic BPABI version.  */