diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.7/use-defaults.h-and-t-oe-in-B.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.7/use-defaults.h-and-t-oe-in-B.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/use-defaults.h-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-4.7/use-defaults.h-and-t-oe-in-B.patch new file mode 100644 index 0000000000..212c26324c --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.7/use-defaults.h-and-t-oe-in-B.patch | |||
@@ -0,0 +1,77 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that | ||
4 | the source can be shared between gcc-cross-initial, | ||
5 | gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build. | ||
6 | --- | ||
7 | gcc/Makefile.in | 2 +- | ||
8 | gcc/configure | 4 ++-- | ||
9 | gcc/configure.ac | 4 ++-- | ||
10 | gcc/mkconfig.sh | 4 ++-- | ||
11 | 4 files changed, 7 insertions(+), 7 deletions(-) | ||
12 | |||
13 | Index: gcc-4_7-branch/gcc/Makefile.in | ||
14 | =================================================================== | ||
15 | --- gcc-4_7-branch.orig/gcc/Makefile.in 2012-04-10 10:37:09.347387424 -0700 | ||
16 | +++ gcc-4_7-branch/gcc/Makefile.in 2012-04-10 10:39:24.019393881 -0700 | ||
17 | @@ -481,7 +481,7 @@ | ||
18 | TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ | ||
19 | |||
20 | xmake_file=@xmake_file@ | ||
21 | -tmake_file=@tmake_file@ | ||
22 | +tmake_file=@tmake_file@ ./t-oe | ||
23 | TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@ | ||
24 | TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ | ||
25 | TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ | ||
26 | Index: gcc-4_7-branch/gcc/configure | ||
27 | =================================================================== | ||
28 | --- gcc-4_7-branch.orig/gcc/configure 2012-04-10 10:37:57.211389779 -0700 | ||
29 | +++ gcc-4_7-branch/gcc/configure 2012-04-10 10:39:24.027393938 -0700 | ||
30 | @@ -11692,8 +11692,8 @@ | ||
31 | tm_include_list="${tm_include_list} $f" | ||
32 | ;; | ||
33 | defaults.h ) | ||
34 | - tm_file_list="${tm_file_list} \$(srcdir)/$f" | ||
35 | - tm_include_list="${tm_include_list} $f" | ||
36 | + tm_file_list="${tm_file_list} ./$f" | ||
37 | + tm_include_list="${tm_include_list} ./$f" | ||
38 | ;; | ||
39 | * ) | ||
40 | tm_file_list="${tm_file_list} \$(srcdir)/config/$f" | ||
41 | Index: gcc-4_7-branch/gcc/configure.ac | ||
42 | =================================================================== | ||
43 | --- gcc-4_7-branch.orig/gcc/configure.ac 2012-04-10 10:37:57.215389769 -0700 | ||
44 | +++ gcc-4_7-branch/gcc/configure.ac 2012-04-10 10:39:24.027393938 -0700 | ||
45 | @@ -1699,8 +1699,8 @@ | ||
46 | tm_include_list="${tm_include_list} $f" | ||
47 | ;; | ||
48 | defaults.h ) | ||
49 | - tm_file_list="${tm_file_list} \$(srcdir)/$f" | ||
50 | - tm_include_list="${tm_include_list} $f" | ||
51 | + tm_file_list="${tm_file_list} ./$f" | ||
52 | + tm_include_list="${tm_include_list} ./$f" | ||
53 | ;; | ||
54 | * ) | ||
55 | tm_file_list="${tm_file_list} \$(srcdir)/config/$f" | ||
56 | Index: gcc-4_7-branch/gcc/mkconfig.sh | ||
57 | =================================================================== | ||
58 | --- gcc-4_7-branch.orig/gcc/mkconfig.sh 2012-04-10 10:17:24.383330061 -0700 | ||
59 | +++ gcc-4_7-branch/gcc/mkconfig.sh 2012-04-10 10:39:24.027393938 -0700 | ||
60 | @@ -78,7 +78,7 @@ | ||
61 | if [ $# -ge 1 ]; then | ||
62 | echo '#ifdef IN_GCC' >> ${output}T | ||
63 | for file in "$@"; do | ||
64 | - if test x"$file" = x"defaults.h"; then | ||
65 | + if test x"$file" = x"./defaults.h"; then | ||
66 | postpone_defaults_h="yes" | ||
67 | else | ||
68 | echo "# include \"$file\"" >> ${output}T | ||
69 | @@ -104,7 +104,7 @@ | ||
70 | |||
71 | # If we postponed including defaults.h, add the #include now. | ||
72 | if test x"$postpone_defaults_h" = x"yes"; then | ||
73 | - echo "# include \"defaults.h\"" >> ${output}T | ||
74 | + echo "# include \"./defaults.h\"" >> ${output}T | ||
75 | fi | ||
76 | |||
77 | # Add multiple inclusion protection guard, part two. | ||