Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 1 | From de4427fa49c07dc651ee6ceaf5c5078700ca3b08 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 09:30:32 +0400 |
Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 4 | Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI. |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 5 | |
| 6 | The LINK_SPEC for linux gets overwritten by linux-eabi.h which |
| 7 | means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result |
| 8 | the option is not passed to linker when chosing march=armv4 |
| 9 | This patch redefines this in linux-eabi.h and reinserts it |
| 10 | for eabi defaulting toolchains. |
| 11 | |
| 12 | We might want to send it upstream. |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | |
| 16 | Upstream-Status: Pending |
| 17 | --- |
| 18 | gcc/config/arm/linux-eabi.h | 6 +++++- |
| 19 | 1 file changed, 5 insertions(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h |
Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 22 | index 0c0332f317f..7b3769e8459 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 23 | --- a/gcc/config/arm/linux-eabi.h |
| 24 | +++ b/gcc/config/arm/linux-eabi.h |
| 25 | @@ -91,10 +91,14 @@ |
| 26 | #define MUSL_DYNAMIC_LINKER \ |
Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 27 | "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1" |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 28 | |
| 29 | +/* For armv4 we pass --fix-v4bx to linker to support EABI */ |
| 30 | +#undef TARGET_FIX_V4BX_SPEC |
| 31 | +#define TARGET_FIX_V4BX_SPEC "%{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4: --fix-v4bx}" |
| 32 | + |
| 33 | /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to |
| 34 | use the GNU/Linux version, not the generic BPABI version. */ |
| 35 | #undef LINK_SPEC |
| 36 | -#define LINK_SPEC EABI_LINK_SPEC \ |
| 37 | +#define LINK_SPEC TARGET_FIX_V4BX_SPEC EABI_LINK_SPEC \ |
| 38 | LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC, \ |
| 39 | LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC) |
| 40 | |