diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-06-28 12:19:53 -0700 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-09 18:40:21 +0200 |
commit | 6b278fbb02d818b54b5a9fa2716fc49e896b72a8 (patch) | |
tree | 833783fb738ff7abf3d0e3029c9a468e73b06e28 /toolchain-layer/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch | |
parent | 680af24d1ff95533db610176e6b01fcc9dcf6699 (diff) | |
download | meta-openembedded-6b278fbb02d818b54b5a9fa2716fc49e896b72a8.tar.gz |
gcc-4.6: Migrate recipes from OE-Core
Remove linaro patches. If one needs to use linaro
modified gcc they should use meta-linaro
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'toolchain-layer/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch')
-rw-r--r-- | toolchain-layer/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch new file mode 100644 index 0000000000..731067741d --- /dev/null +++ b/toolchain-layer/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile | ||
2 | preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location | ||
3 | rather than the --sysroot option specified on the commandline. If access to that directory is | ||
4 | permission denied (unreadable), gcc will error. | ||
5 | |||
6 | This happens when ccache is in use due to the fact it uses preprocessed source files. | ||
7 | |||
8 | The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix, | ||
9 | -isystem, -isysroot happen and the correct sysroot is used. | ||
10 | |||
11 | [YOCTO #2074] | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | RP 2012/04/13 | ||
16 | |||
17 | Index: gcc-4_6-branch/gcc/gcc.c | ||
18 | =================================================================== | ||
19 | --- gcc-4_6-branch.orig/gcc/gcc.c 2012-04-13 12:24:37.939671140 +0000 | ||
20 | +++ gcc-4_6-branch/gcc/gcc.c 2012-04-13 12:24:54.439670688 +0000 | ||
21 | @@ -953,7 +953,7 @@ | ||
22 | %W{o*:--output-pch=%*}}%V}}}}}}", 0, 0, 0}, | ||
23 | {".i", "@cpp-output", 0, 0, 0}, | ||
24 | {"@cpp-output", | ||
25 | - "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, | ||
26 | + "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %I %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, | ||
27 | {".s", "@assembler", 0, 0, 0}, | ||
28 | {"@assembler", | ||
29 | "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0}, | ||
30 | Index: gcc-4_6-branch/gcc/cp/lang-specs.h | ||
31 | =================================================================== | ||
32 | --- gcc-4_6-branch.orig/gcc/cp/lang-specs.h 2012-04-13 12:25:01.019670594 +0000 | ||
33 | +++ gcc-4_6-branch/gcc/cp/lang-specs.h 2012-04-13 12:25:07.567670180 +0000 | ||
34 | @@ -64,5 +64,5 @@ | ||
35 | {".ii", "@c++-cpp-output", 0, 0, 0}, | ||
36 | {"@c++-cpp-output", | ||
37 | "%{!M:%{!MM:%{!E:\ | ||
38 | - cc1plus -fpreprocessed %i %(cc1_options) %2\ | ||
39 | + cc1plus -fpreprocessed %i %I %(cc1_options) %2\ | ||
40 | %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, | ||