diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch index 18a9fb8701..492300047d 100644 --- a/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch +++ b/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch @@ -1,4 +1,4 @@ -From 118c6f054711d437167ff125a88c9236bfc8099c Mon Sep 17 00:00:00 2001 +From 52676b5934ba127c3af39fc484c8236c8fa60b96 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 8 Mar 2021 16:04:20 -0800 Subject: [PATCH] gcc: poison-system-directories @@ -11,7 +11,7 @@ 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 +Upstream-Status: Inappropriate [OE configuration] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- @@ -20,15 +20,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> gcc/configure | 19 +++++++++++++++++++ gcc/configure.ac | 16 ++++++++++++++++ gcc/doc/invoke.texi | 9 +++++++++ - gcc/gcc.c | 9 +++++++-- - gcc/incpath.c | 21 +++++++++++++++++++++ + gcc/gcc.cc | 9 +++++++-- + gcc/incpath.cc | 21 +++++++++++++++++++++ 7 files changed, 86 insertions(+), 2 deletions(-) diff --git a/gcc/common.opt b/gcc/common.opt -index c75dd36843e..49acbd6ed44 100644 +index 862c474d3c8..64c4277c991 100644 --- a/gcc/common.opt +++ b/gcc/common.opt -@@ -683,6 +683,10 @@ Wreturn-local-addr +@@ -711,6 +711,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. @@ -40,10 +40,10 @@ index c75dd36843e..49acbd6ed44 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 10a13cde586..8848284da41 100644 +index 4cad077bfbe..80e832fdb84 100644 --- a/gcc/config.in +++ b/gcc/config.in -@@ -218,6 +218,16 @@ +@@ -236,6 +236,16 @@ #endif @@ -61,10 +61,10 @@ index 10a13cde586..8848284da41 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 9bb436ce7bd..3f0734bff11 100755 +index c7b26d1927d..3508be7b439 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -1020,6 +1020,7 @@ enable_maintainer_mode +@@ -1026,6 +1026,7 @@ enable_maintainer_mode enable_link_mutex enable_link_serialization enable_version_specific_runtime_libs @@ -72,7 +72,7 @@ index 9bb436ce7bd..3f0734bff11 100755 enable_plugin enable_host_shared enable_libquadmath_support -@@ -1782,6 +1783,8 @@ Optional Features: +@@ -1788,6 +1789,8 @@ Optional Features: --enable-version-specific-runtime-libs specify that runtime libraries should be installed in a compiler-specific directory @@ -81,7 +81,7 @@ index 9bb436ce7bd..3f0734bff11 100755 --enable-plugin enable plugin support --enable-host-shared build host code as shared libraries --disable-libquadmath-support -@@ -31325,6 +31328,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : +@@ -31753,6 +31756,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : fi @@ -105,10 +105,10 @@ index 9bb436ce7bd..3f0734bff11 100755 diff --git a/gcc/configure.ac b/gcc/configure.ac -index caa611933df..54e21764b3e 100644 +index 09082e8ccae..6cd01a8966b 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -7123,6 +7123,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, +@@ -7292,6 +7292,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, [specify that runtime libraries should be installed in a compiler-specific directory])]) @@ -132,37 +132,37 @@ index caa611933df..54e21764b3e 100644 AC_SUBST(subdirs) AC_SUBST(srcdir) diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 7a368959e5e..6659a903bf0 100644 +index de40f62e219..d6f203c8b71 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -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 -+-Wno-poison-system-directories @gol - -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol - -Wrestrict -Wno-return-local-addr -Wreturn-type @gol - -Wno-scalar-storage-order -Wsequence-point @gol -@@ -7735,6 +7736,14 @@ made up of data only and thus requires no special treatment. But, for +@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}. + -Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded + -Wparentheses -Wno-pedantic-ms-format + -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast ++-Wno-poison-system-directories + -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls + -Wrestrict -Wno-return-local-addr -Wreturn-type + -Wno-scalar-storage-order -Wsequence-point +@@ -8426,6 +8427,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. -+@item -Wno-poison-system-directories +@opindex Wno-poison-system-directories ++@item -Wno-poison-system-directories +Do not warn for @option{-I} or @option{-L} options using system +directories such as @file{/usr/include} when cross compiling. This +option is intended for use in chroot environments when such +directories contain the correct headers and libraries for the target +system rather than the host. + - @item -Wfloat-equal @opindex Wfloat-equal @opindex Wno-float-equal -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 7837553958b..19c75b6e20d 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -1152,6 +1152,8 @@ proper position among the other output files. */ + @item -Wfloat-equal +diff --git a/gcc/gcc.cc b/gcc/gcc.cc +index 16bb07f2cdc..5feae021545 100644 +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -1146,6 +1146,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}}} \ @@ -171,7 +171,7 @@ index 7837553958b..19c75b6e20d 100644 %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \ VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \ %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ -@@ -1247,8 +1249,11 @@ static const char *cpp_unique_options = +@@ -1241,8 +1243,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 +185,10 @@ index 7837553958b..19c75b6e20d 100644 /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al. -diff --git a/gcc/incpath.c b/gcc/incpath.c -index 446d280321d..fbfc0ce03b8 100644 ---- a/gcc/incpath.c -+++ b/gcc/incpath.c +diff --git a/gcc/incpath.cc b/gcc/incpath.cc +index 4d44321183f..46c0d543205 100644 +--- a/gcc/incpath.cc ++++ b/gcc/incpath.cc @@ -26,6 +26,7 @@ #include "intl.h" #include "incpath.h" @@ -197,7 +197,7 @@ index 446d280321d..fbfc0ce03b8 100644 /* Microsoft Windows does not natively support inodes. VMS has non-numeric inodes. */ -@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) +@@ -399,6 +400,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) } fprintf (stderr, _("End of search list.\n")); } @@ -208,17 +208,17 @@ index 446d280321d..fbfc0ce03b8 100644 + struct cpp_dir *p; + + for (p = heads[INC_QUOTE]; p; p = p->next) -+ { -+ if ((!strncmp (p->name, "/usr/include", 12)) -+ || (!strncmp (p->name, "/usr/local/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", -+ p->name); -+ } ++ { ++ if ((!strncmp (p->name, "/usr/include", 12)) ++ || (!strncmp (p->name, "/usr/local/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", ++ p->name); ++ } + } +#endif } |