mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 18:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

gcc: Merge two related patches together

Browse Source 
These patches may as well be merged together as they affect the same code
and things are clearer this way.

(From OE-Core rev: 7533c000183a2b447cbabd6ce1b8b75de55b63e7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2018-09-04 12:59:01 +01:00
parent c539765288
commit 341c0d7d82
3 changed files with 4 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-devtools/gcc/gcc-8.2.inc
View File

@@ -33,7 +33,6 @@ SRC_URI = "\
${BASEURI} \ ${BASEURI} \
file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
file://0003-gcc-poison-system-directories.patch \ file://0003-gcc-poison-system-directories.patch \
file://0004-gcc-poison-dir-extend.patch \
file://0005-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \ file://0005-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
file://0006-64-bit-multilib-hack.patch \ file://0006-64-bit-multilib-hack.patch \
file://0007-optional-libstdc.patch \ file://0007-optional-libstdc.patch \

6
meta/recipes-devtools/gcc/gcc-8.2/0003-gcc-poison-system-directories.patch
View File

@@ -162,7 +162,7 @@ index b11c6a57939..e3b7a21966f 100644
/* Microsoft Windows does not natively support inodes. /* Microsoft Windows does not natively support inodes.
VMS has non-numeric inodes. */ VMS has non-numeric inodes. */
@@ -393,6 +394,24 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) @@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
} }
fprintf (stderr, _("End of search list.\n")); fprintf (stderr, _("End of search list.\n"));
} }
@@ -176,7 +176,9 @@ index b11c6a57939..e3b7a21966f 100644
+ { + {
+ if ((!strncmp (p->name, "/usr/include", 12)) + if ((!strncmp (p->name, "/usr/include", 12))
+ || (!strncmp (p->name, "/usr/local/include", 18)) + || (!strncmp (p->name, "/usr/local/include", 18))
+ || (!strncmp (p->name, "/usr/X11R6/include", 18))) + || (!strncmp (p->name, "/usr/X11R6/include", 18))
+ || (!strncmp (p->name, "/sw/include", 11))
+ || (!strncmp (p->name, "/opt/include", 12)))
+ warning (OPT_Wpoison_system_directories, + warning (OPT_Wpoison_system_directories,
+ "include location \"%s\" is unsafe for " + "include location \"%s\" is unsafe for "
+ "cross-compilation", + "cross-compilation",

39
meta/recipes-devtools/gcc/gcc-8.2/0004-gcc-poison-dir-extend.patch
View File

@@ -1,39 +0,0 @@
From 97370eadcd10da5da529dfb734df56993ce24644 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:00:34 +0400
Subject: [PATCH 04/39] gcc-poison-dir-extend
Add /sw/include and /opt/include based on the original
zecke-no-host-includes.patch patch. The original patch checked for
/usr/include, /sw/include and /opt/include and then triggered a failure and
aborted.
Instead, we add the two missing items to the current scan. If the user
wants this to be a failure, they can add "-Werror=poison-system-directories".
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
---
gcc/incpath.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gcc/incpath.c b/gcc/incpath.c
index e3b7a21966f..9a457e02dd3 100644
--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -404,7 +404,9 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
{
if ((!strncmp (p->name, "/usr/include", 12))
|| (!strncmp (p->name, "/usr/local/include", 18))
- || (!strncmp (p->name, "/usr/X11R6/include", 18)))
+ || (!strncmp (p->name, "/usr/X11R6/include", 18))
+ || (!strncmp (p->name, "/sw/include", 11))
+ || (!strncmp (p->name, "/opt/include", 12)))
warning (OPT_Wpoison_system_directories,
"include location \"%s\" is unsafe for "
"cross-compilation",
--
2.17.0