summaryrefslogtreecommitdiff
path: root/meta-linaro-toolchain/recipes-devtools/gcc/gcc-4.7/use-defaults.h-and-t-oe-in-B.patch
blob: 212c26324cca47fc39d411dd5f79f4aa141ccce0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
Upstream-Status: Pending

Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
the source can be shared between gcc-cross-initial,
gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
---
 gcc/Makefile.in  |    2 +-
 gcc/configure    |    4 ++--
 gcc/configure.ac |    4 ++--
 gcc/mkconfig.sh  |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

Index: gcc-4_7-branch/gcc/Makefile.in
===================================================================
--- gcc-4_7-branch.orig/gcc/Makefile.in	2012-04-10 10:37:09.347387424 -0700
+++ gcc-4_7-branch/gcc/Makefile.in	2012-04-10 10:39:24.019393881 -0700
@@ -481,7 +481,7 @@
 TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
 
 xmake_file=@xmake_file@
-tmake_file=@tmake_file@
+tmake_file=@tmake_file@ ./t-oe
 TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@
 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
 TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
Index: gcc-4_7-branch/gcc/configure
===================================================================
--- gcc-4_7-branch.orig/gcc/configure	2012-04-10 10:37:57.211389779 -0700
+++ gcc-4_7-branch/gcc/configure	2012-04-10 10:39:24.027393938 -0700
@@ -11692,8 +11692,8 @@
        tm_include_list="${tm_include_list} $f"
        ;;
     defaults.h )
-       tm_file_list="${tm_file_list} \$(srcdir)/$f"
-       tm_include_list="${tm_include_list} $f"
+       tm_file_list="${tm_file_list} ./$f"
+       tm_include_list="${tm_include_list} ./$f"
        ;;
     * )
        tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
Index: gcc-4_7-branch/gcc/configure.ac
===================================================================
--- gcc-4_7-branch.orig/gcc/configure.ac	2012-04-10 10:37:57.215389769 -0700
+++ gcc-4_7-branch/gcc/configure.ac	2012-04-10 10:39:24.027393938 -0700
@@ -1699,8 +1699,8 @@
        tm_include_list="${tm_include_list} $f"
        ;;
     defaults.h )
-       tm_file_list="${tm_file_list} \$(srcdir)/$f"
-       tm_include_list="${tm_include_list} $f"
+       tm_file_list="${tm_file_list} ./$f"
+       tm_include_list="${tm_include_list} ./$f"
        ;;
     * )
        tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
Index: gcc-4_7-branch/gcc/mkconfig.sh
===================================================================
--- gcc-4_7-branch.orig/gcc/mkconfig.sh	2012-04-10 10:17:24.383330061 -0700
+++ gcc-4_7-branch/gcc/mkconfig.sh	2012-04-10 10:39:24.027393938 -0700
@@ -78,7 +78,7 @@
     if [ $# -ge 1 ]; then
 	echo '#ifdef IN_GCC' >> ${output}T
 	for file in "$@"; do
-	    if test x"$file" = x"defaults.h"; then
+	    if test x"$file" = x"./defaults.h"; then
 		postpone_defaults_h="yes"
 	    else
 		echo "# include \"$file\"" >> ${output}T
@@ -104,7 +104,7 @@
 
 # If we postponed including defaults.h, add the #include now.
 if test x"$postpone_defaults_h" = x"yes"; then
-    echo "# include \"defaults.h\"" >> ${output}T
+    echo "# include \"./defaults.h\"" >> ${output}T
 fi
 
 # Add multiple inclusion protection guard, part two.