diff mbox

[google/gcc-4_6_3-mobile] Port r187569 from google/gcc-4_6 branch (issue 6210060)

Message ID 001636c597706d175e04c01cdf0b@google.com
State New
Headers show

Commit Message

Han Shen May 16, 2012, 1:02 a.m. UTC 
Reviewers: asharif1, jingyu,

Message:
Hi Amhad and Jing, could you take a look at this CL at
http://codereview.appspot.com/6210060/

Thanks,
-Han

Description:
Ported r187569 from google/gcc-4_6 branch.

2012-05-11  Han Shen  <shenhan@google.com>

         Backport from mainline.
         2012-05-01  Richard Earnshaw  <rearnsha@arm.com>

         * arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_DEFAULT): Avoid ifdef
         comparing enumeration values.  Update comments.

         2012-04-26  Michael Hope  <michael.hope@linaro.org>
                     Richard Earnshaw  <rearnsha@arm.com>

         * config/arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_SOFT_FLOAT):
Define.
         (GLIBC_DYNAMIC_LINKER_HARD_FLOAT): Define.
         (GLIBC_DYNAMIC_LINKER_DEFAULT): Define.
         (GLIBC_DYNAMIC_LINKER): Redefine to use the hard float path.

Please review this at http://codereview.appspot.com/6210060/

Affected files:
   M     gcc/config/arm/linux-eabi.h
diff mbox

Patch

Index: gcc/config/arm/linux-eabi.h
===================================================================
--- gcc/config/arm/linux-eabi.h	(revision 187569)
+++ gcc/config/arm/linux-eabi.h	(working copy)
@@ -32,7 +32,8 @@ 
    while (false)

  /* We default to a soft-float ABI so that binaries can run on all
-   target hardware.  */
+   target hardware.  If you override this to use the hard-float ABI then
+   change the setting of GLIBC_DYNAMIC_LINKER_DEFAULT as well.  */
  #undef  TARGET_DEFAULT_FLOAT_ABI
  #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT

@@ -59,11 +60,26 @@ 
  #undef  SUBTARGET_EXTRA_LINK_SPEC
  #define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION

-/* Use ld-linux.so.3 so that it will be possible to run "classic"
-   GNU/Linux binaries on an EABI system.  */
+/* GNU/Linux on ARM currently supports three dynamic linkers:
+   - ld-linux.so.2 - for the legacy ABI
+   - ld-linux.so.3 - for the EABI-derived soft-float ABI
+   - ld-linux-armhf.so.3 - for the EABI-derived hard-float ABI.
+   All the dynamic linkers live in /lib.
+   We default to soft-float, but this can be overridden by changing both
+   GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI.  */
+
  #undef  GLIBC_DYNAMIC_LINKER
-#define GLIBC_DYNAMIC_LINKER RUNTIME_ROOT_PREFIX "/lib/ld-linux.so.3"
+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT \
+  RUNTIME_ROOT_PREFIX "/lib/ld-linux.so.3"
+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT \
+  RUNTIME_ROOT_PREFIX "/lib/ld-linux-armhf.so.3"
+#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT

+#define GLIBC_DYNAMIC_LINKER \
+   "%{mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \
+    %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
+    %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
+
  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
     use the GNU/Linux version, not the generic BPABI version.  */
  #undef  LINK_SPEC