mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 21:32:13 +02:00
gcc5: Upgrade from 5.1 to 5.2
This is second bugfix release in gcc5 series All backported patches are dropped no other patches needed any rework (From OE-Core rev: 2a212e56a814e5dc8a8bae4974b91109ed0486ef) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -0,0 +1,54 @@
|
||||
From 6e6283d645c83ca534219a02ae882a3d7be95ff1 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 20/35] 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 b0728f0..e69ee7d 100644
|
||||
--- a/gcc/cp/lang-specs.h
|
||||
+++ b/gcc/cp/lang-specs.h
|
||||
@@ -63,5 +63,5 @@ along with GCC; see the file COPYING3. If not see
|
||||
{".ii", "@c++-cpp-output", 0, 0, 0},
|
||||
{"@c++-cpp-output",
|
||||
"%{!M:%{!MM:%{!E:\
|
||||
- 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 87b47c5..e6efae7 100644
|
||||
--- a/gcc/gcc.c
|
||||
+++ b/gcc/gcc.c
|
||||
@@ -1142,7 +1142,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},
|
||||
--
|
||||
2.1.4
|
||||
|
||||
Reference in New Issue
Block a user