gcc: Tweak arm multilib endian patch for baremetal

In a baremetal build, TARGET_ENDIAN_OPTION isn't set leading to build
failures. Add in ifdefs to avoid this.

(From OE-Core rev: 3a50ec5f0142cc3a74b405dbdff264f8f862edfa)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2015-03-26 23:55:12 +00:00
parent 6978d8aaa9
commit c0e32b475e
1 changed files with 16 additions and 8 deletions

View File

@ -11,26 +11,34 @@ Upstream-Status: Pending
gcc/config/arm/linux-elf.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gcc-4.9-20140316/gcc/config/arm/coff.h
Index: gcc-4.9.2/gcc/config/arm/coff.h
===================================================================
--- gcc-4.9-20140316.orig/gcc/config/arm/coff.h
+++ gcc-4.9-20140316/gcc/config/arm/coff.h
@@ -33,7 +33,7 @@
--- gcc-4.9.2.orig/gcc/config/arm/coff.h
+++ gcc-4.9.2/gcc/config/arm/coff.h
@@ -32,8 +32,11 @@
#define TARGET_DEFAULT (MASK_APCS_FRAME)
#ifndef MULTILIB_DEFAULTS
+#ifndef TARGET_ENDIAN_OPTION
+#define TARGET_ENDIAN_OPTION "mlittle-endian"
+#endif
#define MULTILIB_DEFAULTS \
- { "marm", "mlittle-endian", "mfloat-abi=soft", "mno-thumb-interwork" }
+ { "marm", TARGET_ENDIAN_OPTION, "mfloat-abi=soft", "mno-thumb-interwork" }
#endif
/* This is COFF, but prefer stabs. */
Index: gcc-4.9-20140316/gcc/config/arm/elf.h
Index: gcc-4.9.2/gcc/config/arm/elf.h
===================================================================
--- gcc-4.9-20140316.orig/gcc/config/arm/elf.h
+++ gcc-4.9-20140316/gcc/config/arm/elf.h
@@ -112,7 +112,7 @@
--- gcc-4.9.2.orig/gcc/config/arm/elf.h
+++ gcc-4.9.2/gcc/config/arm/elf.h
@@ -116,8 +116,11 @@
#endif
#ifndef MULTILIB_DEFAULTS
+#ifndef TARGET_ENDIAN_OPTION
+#define TARGET_ENDIAN_OPTION "mlittle-endian"
+#endif
#define MULTILIB_DEFAULTS \
- { "marm", "mlittle-endian", "mfloat-abi=soft", "mno-thumb-interwork", "fno-leading-underscore" }
+ { "marm", TARGET_ENDIAN_OPTION, "mfloat-abi=soft", "mno-thumb-interwork", "fno-leading-underscore" }