toolchain/gcc-4.6-linaro: fix v4bx patch

SVN-Revision: 30969

diff --git a/toolchain/gcc/patches/4.6-linaro/840-armv4_pass_fix-v4bx_to_ld.patch b/toolchain/gcc/patches/4.6-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
index e5a26c17d4baf1c0306dcbae9e474bd0874ca7fb..67c374d9ad471d3fc68351d5fa86fa429e9534e9 100644 (file)
--- a/toolchain/gcc/patches/4.6-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/toolchain/gcc/patches/4.6-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
@@ -1,20 +1,19 @@
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
-@@ -64,12 +64,16 @@
+@@ -64,10 +64,15 @@
  #undef  GLIBC_DYNAMIC_LINKER
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
  
 +/* For armv4 we pass --fix-v4bx to linker to support EABI */
 +#undef TARGET_FIX_V4BX_SPEC
-+#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4:--fix-v4bx}"
++#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*"\
++  "|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx}"
 +
  /* 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
- #define LINK_SPEC BE8_LINK_SPEC                                               \
+-#define LINK_SPEC BE8_LINK_SPEC                                               \
++#define LINK_SPEC BE8_LINK_SPEC TARGET_FIX_V4BX_SPEC                  \
    LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,                                \
--                     LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
-+                     LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)    \
+                      LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
  
- #undef  CC1_SPEC
- #define CC1_SPEC                                                      \