grabbed from openembedded Upstream-Status: Inappropriate [distribution: codesourcery] gcc/ 2008-07-02 Joseph Myers * c-incpath.c: Include toplev.h. (merge_include_chains): Use warning instead of cpp_error for system directory poisoning diagnostic. * Makefile.in (c-incpath.o): Depend on toplev.h. * gcc.c (LINK_COMMAND_SPEC): Pass --error-poison-system-directories if -Werror=poison-system-directories. 2007-06-13 Joseph Myers * common.opt (--Wno-poison-system-directories): New. * doc/invoke.texi (-Wno-poison-system-directories): Document. * c-incpath.c: Include flags.h. (merge_include_chains): Check flag_poison_system_directories. * gcc.c (LINK_COMMAND_SPEC): Pass --no-poison-system-directories to linker if -Wno-poison-system-directories. * Makefile.in (c-incpath.o): Depend on $(FLAGS_H). 2007-03-20 Daniel Jacobowitz Joseph Myers * configure.ac (--enable-poison-system-directories): New option. * configure, config.in: Regenerate. * c-incpath.c (merge_include_chains): If ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /usr/include, /usr/local/include or /usr/X11R6/include. --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2018,7 +2018,7 @@ attribs.o : attribs.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \ intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \ - $(MACHMODE_H) + $(MACHMODE_H) $(FLAGS_H) toplev.h CFLAGS-prefix.o += -DPREFIX=\"$(prefix)\" -DBASEVER=$(BASEVER_s) prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h prefix.h \ --- a/gcc/common.opt +++ b/gcc/common.opt @@ -595,6 +595,10 @@ Wpedantic Common Var(pedantic) Warning Issue warnings needed for strict compliance to the standard +Wpoison-system-directories +Common Var(flag_poison_system_directories) Init(1) Warning +Warn for -I and -L options using system directories if cross compiling + Wshadow Common Var(warn_shadow) Warning Warn when one local variable shadows another --- a/gcc/config.in +++ b/gcc/config.in @@ -138,6 +138,12 @@ #endif +/* Define to warn for use of native system header directories */ +#ifndef USED_FOR_TARGET +#undef ENABLE_POISON_SYSTEM_DIRECTORIES +#endif + + /* Define if you want all operations on RTL (the basic data structure of the optimizer and back end) to be checked for dynamic type safety at runtime. This is quite expensive. */ --- a/gcc/configure +++ b/gcc/configure @@ -917,6 +917,7 @@ with_gc with_system_zlib enable_maintainer_mode enable_version_specific_runtime_libs +enable_poison_system_directories enable_plugin enable_libquadmath_support with_linker_hash_style @@ -1630,6 +1631,8 @@ Optional Features: --enable-version-specific-runtime-libs specify that runtime libraries should be installed in a compiler-specific directory + --enable-poison-system-directories + warn for use of native system header directories --enable-plugin enable plugin support --disable-libquadmath-support disable libquadmath support for Fortran @@ -27103,6 +27106,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : fi +# Check whether --enable-poison-system-directories was given. +if test "${enable_poison_system_directories+set}" = set; then : + enableval=$enable_poison_system_directories; +else + enable_poison_system_directories=no +fi + +if test "x${enable_poison_system_directories}" = "xyes"; then + +$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h + +fi + # Substitute configuration variables --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5063,6 +5063,16 @@ 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]),, + [enable_poison_system_directories=no]) +if test "x${enable_poison_system_directories}" = "xyes"; then + AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], + [1], + [Define to warn for use of native system header directories]) +fi + # Substitute configuration variables AC_SUBST(subdirs) AC_SUBST(srcdir) --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -258,6 +258,7 @@ Objective-C and Objective-C++ Dialects}. -Woverlength-strings -Wpacked -Wpacked-bitfield-compat -Wpadded @gol -Wparentheses -Wpedantic-ms-format -Wno-pedantic-ms-format @gol -Wpointer-arith -Wno-pointer-to-int-cast @gol +-Wno-poison-system-directories @gol -Wredundant-decls -Wno-return-local-addr @gol -Wreturn-type -Wsequence-point -Wshadow @gol -Wsign-compare -Wsign-conversion -Wsizeof-pointer-memaccess @gol @@ -4023,6 +4024,14 @@ should check to see whether the two values have ranges that overlap; and this is done with the relational operators, so equality comparisons are probably mistaken. +@item -Wno-poison-system-directories +@opindex 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 -Wtraditional @r{(C and Objective-C only)} @opindex Wtraditional @opindex Wno-traditional --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -740,6 +740,8 @@ proper position among the other output files. */ "%{fuse-ld=*:-fuse-ld=%*}\ %X %{o*} %{e*} %{N} %{n} %{r}\ %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}\ + %{Wno-poison-system-directories:--no-poison-system-directories}\ + %{Werror=poison-system-directories:--error-poison-system-directories}\ %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\ %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\ %{fgnu-tm:%:include(libitm.spec)%(link_itm)}\ --- a/gcc/incpath.c +++ b/gcc/incpath.c @@ -28,6 +28,7 @@ #include "intl.h" #include "incpath.h" #include "cppdefault.h" +#include "diagnostic.h" /* Microsoft Windows does not natively support inodes. VMS has non-numeric inodes. */ @@ -382,6 +382,25 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) } fprintf (stderr, _("End of search list.\n")); } +#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES + if (flag_poison_system_directories) + { + struct cpp_dir *p; + + for (p = heads[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); + } + } +#endif } /* Use given -I paths for #include "..." but not #include <...>, and