mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-07-27 19:37:04 +00:00
Sumit Garg
13972eed3c
Update Arm GCC toolchain recipe and patches accordingly. Signed-off-by: Sumit Garg <sumit.garg@linaro.org> Changes in v2: - Drop support for 10.2 release. - Update CI to use 10.3 release instead. Signed-off-by: Jon Mason <jon.mason@arm.com>
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From 303cc9292cc0a1bd7bae994dd1e86197fb94068d Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Fri, 29 Mar 2013 09:22:00 +0400
|
|
Subject: [PATCH] cpp: honor sysroot.
|
|
|
|
Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile
|
|
preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location
|
|
rather than the --sysroot option specified on the commandline. If access to that directory is
|
|
permission denied (unreadable), gcc will error.
|
|
|
|
This happens when ccache is in use due to the fact it uses preprocessed source files.
|
|
|
|
The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix,
|
|
-isystem, -isysroot happen and the correct sysroot is used.
|
|
|
|
[YOCTO #2074]
|
|
|
|
RP 2012/04/13
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
Upstream-Status: Pending
|
|
---
|
|
gcc/cp/lang-specs.h | 2 +-
|
|
gcc/gcc.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
|
|
index 0ad4a33b93e..16c744f4f90 100644
|
|
--- a/gcc/cp/lang-specs.h
|
|
+++ b/gcc/cp/lang-specs.h
|
|
@@ -66,5 +66,5 @@ along with GCC; see the file COPYING3. If not see
|
|
{".ii", "@c++-cpp-output", 0, 0, 0},
|
|
{"@c++-cpp-output",
|
|
"%{!E:%{!M:%{!MM:"
|
|
- " cc1plus -fpreprocessed %i %(cc1_options) %2"
|
|
+ " cc1plus -fpreprocessed %i %I %(cc1_options) %2"
|
|
" %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
|
|
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
|
index 39b1635651a..e2e0bcee9b2 100644
|
|
--- a/gcc/gcc.c
|
|
+++ b/gcc/gcc.c
|
|
@@ -1351,7 +1351,7 @@ static const struct compiler default_compilers[] =
|
|
%W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
|
|
{".i", "@cpp-output", 0, 0, 0},
|
|
{"@cpp-output",
|
|
- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
|
|
+ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %I %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
|
|
{".s", "@assembler", 0, 0, 0},
|
|
{"@assembler",
|
|
"%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
|