summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-11-13 10:05:30 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-20 14:08:13 (GMT)
commitc360dcbda8358286306fbee1073ae00fc7854bbe (patch)
tree404d706f221e6e56650f6368081e931225589d38
parent3e813f458d5ac66374da186e090bd6ec4558060e (diff)
downloadpoky-c360dcbda8358286306fbee1073ae00fc7854bbe.tar.gz
gcc-4.9: fix the compile failure of 'defaults.h' not found
While compiling gcc-crosssdk-initial-x86_64 on some host, there is occasionally failure that test the existance of default.h doesn't work. ... | tmp/work-shared/gcc-4.9.1-r0/gcc-4.9.1/gcc/calls.c:1240: error: 'STACK_CHECK_MAX_VAR_SIZE' was not declared in this scope ... The reason is tm_include_list='** defaults.h' rather than tm_include_list='** ./defaults.h' So we add the test condition for this situation. (From OE-Core rev: fec684512c6f934d7a847b0c9f5151da81426910) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch30
1 files changed, 19 insertions, 11 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-4.9/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
index 9e4435c..fddfe9e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.9/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
@@ -1,4 +1,4 @@
1From 46d52439052f0876a92dcf8a0ab9c60d75c8030b Mon Sep 17 00:00:00 2001 1From f7d49ca445e60faa1b5256c6b4f96c1ee5c0e353 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:17:25 +0400 3Date: Fri, 29 Mar 2013 09:17:25 +0400
4Subject: [PATCH 23/35] Use the defaults.h in ${B} instead of ${S}, and t-oe 4Subject: [PATCH 23/35] Use the defaults.h in ${B} instead of ${S}, and t-oe
@@ -11,6 +11,14 @@ gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 12
13Upstream-Status: Pending 13Upstream-Status: Pending
14
15While compiling gcc-crosssdk-initial-x86_64 on some host, there is
16occasionally failure that test the existance of default.h doesn't
17work, the reason is tm_include_list='** defaults.h' rather than
18tm_include_list='** ./defaults.h'
19
20So we add the test condition for this situation.
21Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14--- 22---
15 gcc/Makefile.in | 2 +- 23 gcc/Makefile.in | 2 +-
16 gcc/configure | 4 ++-- 24 gcc/configure | 4 ++--
@@ -19,10 +27,10 @@ Upstream-Status: Pending
19 4 files changed, 7 insertions(+), 7 deletions(-) 27 4 files changed, 7 insertions(+), 7 deletions(-)
20 28
21diff --git a/gcc/Makefile.in b/gcc/Makefile.in 29diff --git a/gcc/Makefile.in b/gcc/Makefile.in
22index 90a2bba..2320497 100644 30index d1ab22f..15fe4b6 100644
23--- a/gcc/Makefile.in 31--- a/gcc/Makefile.in
24+++ b/gcc/Makefile.in 32+++ b/gcc/Makefile.in
25@@ -469,7 +469,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ 33@@ -483,7 +483,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
26 TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ 34 TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
27 35
28 xmake_file=@xmake_file@ 36 xmake_file=@xmake_file@
@@ -32,10 +40,10 @@ index 90a2bba..2320497 100644
32 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ 40 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
33 TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ 41 TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
34diff --git a/gcc/configure b/gcc/configure 42diff --git a/gcc/configure b/gcc/configure
35index bdab45a..d587993 100755 43index 5399b2b..60a04bd 100755
36--- a/gcc/configure 44--- a/gcc/configure
37+++ b/gcc/configure 45+++ b/gcc/configure
38@@ -11539,8 +11539,8 @@ for f in $tm_file; do 46@@ -11631,8 +11631,8 @@ for f in $tm_file; do
39 tm_include_list="${tm_include_list} $f" 47 tm_include_list="${tm_include_list} $f"
40 ;; 48 ;;
41 defaults.h ) 49 defaults.h )
@@ -47,10 +55,10 @@ index bdab45a..d587993 100755
47 * ) 55 * )
48 tm_file_list="${tm_file_list} \$(srcdir)/config/$f" 56 tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
49diff --git a/gcc/configure.ac b/gcc/configure.ac 57diff --git a/gcc/configure.ac b/gcc/configure.ac
50index 5f5c909..5e5e84f 100644 58index f87c3b6..460e0d9 100644
51--- a/gcc/configure.ac 59--- a/gcc/configure.ac
52+++ b/gcc/configure.ac 60+++ b/gcc/configure.ac
53@@ -1720,8 +1720,8 @@ for f in $tm_file; do 61@@ -1740,8 +1740,8 @@ for f in $tm_file; do
54 tm_include_list="${tm_include_list} $f" 62 tm_include_list="${tm_include_list} $f"
55 ;; 63 ;;
56 defaults.h ) 64 defaults.h )
@@ -62,7 +70,7 @@ index 5f5c909..5e5e84f 100644
62 * ) 70 * )
63 tm_file_list="${tm_file_list} \$(srcdir)/config/$f" 71 tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
64diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh 72diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
65index 29fdfc7..e048dce 100644 73index c7146ed..b153f45 100644
66--- a/gcc/mkconfig.sh 74--- a/gcc/mkconfig.sh
67+++ b/gcc/mkconfig.sh 75+++ b/gcc/mkconfig.sh
68@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then 76@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then
@@ -70,11 +78,11 @@ index 29fdfc7..e048dce 100644
70 echo '#ifdef IN_GCC' >> ${output}T 78 echo '#ifdef IN_GCC' >> ${output}T
71 for file in "$@"; do 79 for file in "$@"; do
72- if test x"$file" = x"defaults.h"; then 80- if test x"$file" = x"defaults.h"; then
73+ if test x"$file" = x"./defaults.h"; then 81+ if test x"$file" = x"./defaults.h" -o x"$file" = x"defaults.h"; then
74 postpone_defaults_h="yes" 82 postpone_defaults_h="yes"
75 else 83 else
76 echo "# include \"$file\"" >> ${output}T 84 echo "# include \"$file\"" >> ${output}T
77@@ -103,7 +103,7 @@ esac 85@@ -106,7 +106,7 @@ esac
78 86
79 # If we postponed including defaults.h, add the #include now. 87 # If we postponed including defaults.h, add the #include now.
80 if test x"$postpone_defaults_h" = x"yes"; then 88 if test x"$postpone_defaults_h" = x"yes"; then
@@ -84,5 +92,5 @@ index 29fdfc7..e048dce 100644
84 92
85 # Add multiple inclusion protection guard, part two. 93 # Add multiple inclusion protection guard, part two.
86-- 94--
871.7.10.4 951.9.1
88 96