diff options
Diffstat (limited to 'poky/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch')
| -rw-r--r-- | poky/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch | 55 |
1 files changed, 25 insertions, 30 deletions
diff --git a/poky/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch b/poky/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch index 697bdc821..18a9fb870 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch @@ -1,6 +1,6 @@ -From 74cc21f474402cf3578e37e1d7a1a22bbd070f6a Mon Sep 17 00:00:00 2001 +From 118c6f054711d437167ff125a88c9236bfc8099c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 08:59:00 +0400 +Date: Mon, 8 Mar 2021 16:04:20 -0800 Subject: [PATCH] gcc: poison-system-directories Add /sw/include and /opt/include based on the original @@ -11,11 +11,9 @@ 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". +Upstream-Status: Pending Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> - -Upstream-Status: Pending --- gcc/common.opt | 4 ++++ gcc/config.in | 10 ++++++++++ @@ -27,10 +25,10 @@ Upstream-Status: Pending 7 files changed, 86 insertions(+), 2 deletions(-) diff --git a/gcc/common.opt b/gcc/common.opt -index 3ec7743ea..d3c3e51dc 100644 +index c75dd36843e..49acbd6ed44 100644 --- a/gcc/common.opt +++ b/gcc/common.opt -@@ -682,6 +682,10 @@ Wreturn-local-addr +@@ -683,6 +683,10 @@ Wreturn-local-addr Common Var(warn_return_local_addr) Init(1) Warning Warn about returning a pointer/reference to a local or temporary variable. @@ -42,10 +40,10 @@ index 3ec7743ea..d3c3e51dc 100644 Common Var(warn_shadow) Warning Warn when one variable shadows another. Same as -Wshadow=global. diff --git a/gcc/config.in b/gcc/config.in -index 364eba477..7d2c3bbf1 100644 +index 10a13cde586..8848284da41 100644 --- a/gcc/config.in +++ b/gcc/config.in -@@ -224,6 +224,16 @@ +@@ -218,6 +218,16 @@ #endif @@ -63,18 +61,18 @@ index 364eba477..7d2c3bbf1 100644 optimizer and back end) to be checked for dynamic type safety at runtime. This is quite expensive. */ diff --git a/gcc/configure b/gcc/configure -index 2a9d646b4..a848792f2 100755 +index 9bb436ce7bd..3f0734bff11 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -1010,6 +1010,7 @@ with_system_zlib - enable_maintainer_mode +@@ -1020,6 +1020,7 @@ enable_maintainer_mode enable_link_mutex + enable_link_serialization enable_version_specific_runtime_libs +enable_poison_system_directories enable_plugin enable_host_shared enable_libquadmath_support -@@ -1766,6 +1767,8 @@ Optional Features: +@@ -1782,6 +1783,8 @@ Optional Features: --enable-version-specific-runtime-libs specify that runtime libraries should be installed in a compiler-specific directory @@ -83,7 +81,7 @@ index 2a9d646b4..a848792f2 100755 --enable-plugin enable plugin support --enable-host-shared build host code as shared libraries --disable-libquadmath-support -@@ -30280,6 +30283,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : +@@ -31325,6 +31328,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : fi @@ -107,16 +105,16 @@ index 2a9d646b4..a848792f2 100755 diff --git a/gcc/configure.ac b/gcc/configure.ac -index 51cce36ce..66ffde305 100644 +index caa611933df..54e21764b3e 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -6614,6 +6614,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, +@@ -7123,6 +7123,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, [specify that runtime libraries should be installed in a compiler-specific directory])]) +AC_ARG_ENABLE([poison-system-directories], + AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system header directories (no/yes/error)]),, ++ [warn for use of native system header directories (no/yes/error)]),, + [enable_poison_system_directories=no]) +AC_MSG_NOTICE([poisoned directories $enable_poison_system_directories]) +if test "x${enable_poison_system_directories}" != "xno"; then @@ -134,10 +132,10 @@ index 51cce36ce..66ffde305 100644 AC_SUBST(subdirs) AC_SUBST(srcdir) diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index d929eb109..aa5ff88b1 100644 +index 7a368959e5e..6659a903bf0 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -351,6 +351,7 @@ Objective-C and Objective-C++ Dialects}. +@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}. -Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded @gol -Wparentheses -Wno-pedantic-ms-format @gol -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast @gol @@ -145,7 +143,7 @@ index d929eb109..aa5ff88b1 100644 -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol -Wrestrict -Wno-return-local-addr -Wreturn-type @gol -Wno-scalar-storage-order -Wsequence-point @gol -@@ -6928,6 +6929,14 @@ made up of data only and thus requires no special treatment. But, for +@@ -7735,6 +7736,14 @@ made up of data only and thus requires no special treatment. But, for most targets, it is made up of code and thus requires the stack to be made executable in order for the program to work properly. @@ -161,10 +159,10 @@ index d929eb109..aa5ff88b1 100644 @opindex Wfloat-equal @opindex Wno-float-equal diff --git a/gcc/gcc.c b/gcc/gcc.c -index 49c9c6c17..24a92bf27 100644 +index 7837553958b..19c75b6e20d 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c -@@ -1044,6 +1044,8 @@ proper position among the other output files. */ +@@ -1152,6 +1152,8 @@ proper position among the other output files. */ "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ "%X %{o*} %{e*} %{N} %{n} %{r}\ %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \ @@ -173,7 +171,7 @@ index 49c9c6c17..24a92bf27 100644 %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \ VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \ %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ -@@ -1138,8 +1140,11 @@ static const char *cpp_unique_options = +@@ -1247,8 +1249,11 @@ static const char *cpp_unique_options = static const char *cpp_options = "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\ %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\ @@ -185,10 +183,10 @@ index 49c9c6c17..24a92bf27 100644 +#endif + " %{undef} %{save-temps*:-fpch-preprocess}"; - /* This contains cpp options which are not passed when the preprocessor - output will be used by another program. */ + /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al. + diff --git a/gcc/incpath.c b/gcc/incpath.c -index 94eaba7b1..bfad4ebe3 100644 +index 446d280321d..fbfc0ce03b8 100644 --- a/gcc/incpath.c +++ b/gcc/incpath.c @@ -26,6 +26,7 @@ @@ -199,7 +197,7 @@ index 94eaba7b1..bfad4ebe3 100644 /* Microsoft Windows does not natively support inodes. VMS has non-numeric inodes. */ -@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) +@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) } fprintf (stderr, _("End of search list.\n")); } @@ -226,6 +224,3 @@ index 94eaba7b1..bfad4ebe3 100644 } /* Use given -I paths for #include "..." but not #include <...>, and --- -2.25.1 - |