diff options
author | 2018-02-20 14:10:52 -0800 | |
---|---|---|
committer | 2018-02-23 18:33:03 -0800 | |
commit | a85e1799842242b5ff30a571aa99b7dc2b0f7614 (patch) | |
tree | 8cf6db5ed4eeae133b8134f9489510235af271d5 /meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch-old | |
parent | 92fbbcf383013c982105c84c2c077d23dc21b335 (diff) | |
download | openembedded-core-contrib-a85e1799842242b5ff30a571aa99b7dc2b0f7614.tar.gz |
gcc6: Upgrade to 6.4.1stable/pyro-next
Removed "ubsan-fix-check-empty-string.patch": already upstreamed.
Modified "0010-gcc-poison-system-directories.patch" to apply.
Removed "0011-gcc-poison-dir-extend.patch" does not apply.
Equivalent changes already in "0010-gcc-poison-system-directories.patch"
Removed "0055-unwind_h-glibc26.patch": already upstreamed.
Modified "CVE-2016-6131.patch" to apply (incompatible ChangeLog patching removed).
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch-old')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch-old | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch-old b/meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch-old new file mode 100644 index 0000000000..a1736aea12 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch-old @@ -0,0 +1,39 @@ +From a1c24b59def393e43cd50b6768604a212c788ed3 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 11/46] 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 856da41..d2fc82c 100644 +--- a/gcc/incpath.c ++++ b/gcc/incpath.c +@@ -392,7 +392,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.8.2 + |