summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-26 23:55:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-31 22:23:14 +0100
commitc0e32b475e62781dfe9cd057c8ad6a58b025563d (patch)
tree6b70f750102ea103043bebfa9f7e448b123ad4fe /meta/recipes-devtools/gcc
parent6978d8aaa9c5c9498deeda6d3813e009e085ccf6 (diff)
downloadpoky-c0e32b475e62781dfe9cd057c8ad6a58b025563d.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch24
1 files changed, 16 insertions, 8 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch b/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch
index ba0a2278b7..37c46fc2e2 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch
@@ -11,26 +11,34 @@ Upstream-Status: Pending
11 gcc/config/arm/linux-elf.h | 2 +- 11 gcc/config/arm/linux-elf.h | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 13
14Index: gcc-4.9-20140316/gcc/config/arm/coff.h 14Index: gcc-4.9.2/gcc/config/arm/coff.h
15=================================================================== 15===================================================================
16--- gcc-4.9-20140316.orig/gcc/config/arm/coff.h 16--- gcc-4.9.2.orig/gcc/config/arm/coff.h
17+++ gcc-4.9-20140316/gcc/config/arm/coff.h 17+++ gcc-4.9.2/gcc/config/arm/coff.h
18@@ -33,7 +33,7 @@ 18@@ -32,8 +32,11 @@
19 #define TARGET_DEFAULT (MASK_APCS_FRAME)
19 20
20 #ifndef MULTILIB_DEFAULTS 21 #ifndef MULTILIB_DEFAULTS
22+#ifndef TARGET_ENDIAN_OPTION
23+#define TARGET_ENDIAN_OPTION "mlittle-endian"
24+#endif
21 #define MULTILIB_DEFAULTS \ 25 #define MULTILIB_DEFAULTS \
22- { "marm", "mlittle-endian", "mfloat-abi=soft", "mno-thumb-interwork" } 26- { "marm", "mlittle-endian", "mfloat-abi=soft", "mno-thumb-interwork" }
23+ { "marm", TARGET_ENDIAN_OPTION, "mfloat-abi=soft", "mno-thumb-interwork" } 27+ { "marm", TARGET_ENDIAN_OPTION, "mfloat-abi=soft", "mno-thumb-interwork" }
24 #endif 28 #endif
25 29
26 /* This is COFF, but prefer stabs. */ 30 /* This is COFF, but prefer stabs. */
27Index: gcc-4.9-20140316/gcc/config/arm/elf.h 31Index: gcc-4.9.2/gcc/config/arm/elf.h
28=================================================================== 32===================================================================
29--- gcc-4.9-20140316.orig/gcc/config/arm/elf.h 33--- gcc-4.9.2.orig/gcc/config/arm/elf.h
30+++ gcc-4.9-20140316/gcc/config/arm/elf.h 34+++ gcc-4.9.2/gcc/config/arm/elf.h
31@@ -112,7 +112,7 @@ 35@@ -116,8 +116,11 @@
36 #endif
32 37
33 #ifndef MULTILIB_DEFAULTS 38 #ifndef MULTILIB_DEFAULTS
39+#ifndef TARGET_ENDIAN_OPTION
40+#define TARGET_ENDIAN_OPTION "mlittle-endian"
41+#endif
34 #define MULTILIB_DEFAULTS \ 42 #define MULTILIB_DEFAULTS \
35- { "marm", "mlittle-endian", "mfloat-abi=soft", "mno-thumb-interwork", "fno-leading-underscore" } 43- { "marm", "mlittle-endian", "mfloat-abi=soft", "mno-thumb-interwork", "fno-leading-underscore" }
36+ { "marm", TARGET_ENDIAN_OPTION, "mfloat-abi=soft", "mno-thumb-interwork", "fno-leading-underscore" } 44+ { "marm", TARGET_ENDIAN_OPTION, "mfloat-abi=soft", "mno-thumb-interwork", "fno-leading-underscore" }