diff options
Diffstat (limited to 'main/gcc/67_all_gcc-poison-system-directories.patch')
| -rw-r--r-- | main/gcc/67_all_gcc-poison-system-directories.patch | 188 |
1 files changed, 90 insertions, 98 deletions
diff --git a/main/gcc/67_all_gcc-poison-system-directories.patch b/main/gcc/67_all_gcc-poison-system-directories.patch index a9aee2732d6..72b7e0d4953 100644 --- a/main/gcc/67_all_gcc-poison-system-directories.patch +++ b/main/gcc/67_all_gcc-poison-system-directories.patch @@ -29,13 +29,23 @@ Upstream-Status: Inappropriate [distribution: codesourcery] ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /usr/include, /usr/local/include or /usr/X11R6/include. -Index: gcc-4_7-branch/gcc/common.opt -=================================================================== ---- gcc-4_7-branch.orig/gcc/common.opt 2012-04-10 10:54:04.000000000 -0700 -+++ gcc-4_7-branch/gcc/common.opt 2012-04-10 10:56:02.259442274 -0700 -@@ -582,6 +582,10 @@ - Common Var(warn_padded) Warning - Warn when padding is required to align structure members + +--- 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 @@ -44,11 +54,9 @@ Index: gcc-4_7-branch/gcc/common.opt Wshadow Common Var(warn_shadow) Warning Warn when one local variable shadows another -Index: gcc-4_7-branch/gcc/config.in -=================================================================== ---- gcc-4_7-branch.orig/gcc/config.in 2012-04-10 10:54:04.000000000 -0700 -+++ gcc-4_7-branch/gcc/config.in 2012-04-10 10:56:02.259442274 -0700 -@@ -144,6 +144,12 @@ +--- a/gcc/config.in ++++ b/gcc/config.in +@@ -138,6 +138,12 @@ #endif @@ -61,11 +69,48 @@ Index: gcc-4_7-branch/gcc/config.in /* 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. */ -Index: gcc-4_7-branch/gcc/configure.ac -=================================================================== ---- gcc-4_7-branch.orig/gcc/configure.ac 2012-04-10 10:55:32.000000000 -0700 -+++ gcc-4_7-branch/gcc/configure.ac 2012-04-10 10:56:02.259442274 -0700 -@@ -4959,6 +4959,16 @@ +--- 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])]) @@ -82,21 +127,19 @@ Index: gcc-4_7-branch/gcc/configure.ac # Substitute configuration variables AC_SUBST(subdirs) AC_SUBST(srcdir) -Index: gcc-4_7-branch/gcc/doc/invoke.texi -=================================================================== ---- gcc-4_7-branch.orig/gcc/doc/invoke.texi 2012-04-10 10:54:04.000000000 -0700 -+++ gcc-4_7-branch/gcc/doc/invoke.texi 2012-04-10 10:56:02.263442231 -0700 -@@ -260,6 +260,7 @@ +--- 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 @gol + -Wredundant-decls -Wno-return-local-addr @gol -Wreturn-type -Wsequence-point -Wshadow @gol - -Wsign-compare -Wsign-conversion -Wstack-protector @gol -@@ -3878,6 +3879,14 @@ - 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. + -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 @@ -106,31 +149,34 @@ Index: gcc-4_7-branch/gcc/doc/invoke.texi +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 -Index: gcc-4_7-branch/gcc/gcc.c -=================================================================== ---- gcc-4_7-branch.orig/gcc/gcc.c 2012-04-10 10:54:04.000000000 -0700 -+++ gcc-4_7-branch/gcc/gcc.c 2012-04-10 10:56:02.267442207 -0700 -@@ -673,6 +673,8 @@ - %{flto} %{flto=*} %l " LINK_PIE_SPEC \ - "%X %{o*} %{e*} %{N} %{n} %{r}\ + @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) %o\ + %{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)}\ -Index: gcc-4_7-branch/gcc/incpath.c -=================================================================== ---- gcc-4_7-branch.orig/gcc/incpath.c 2012-04-10 10:54:04.000000000 -0700 -+++ gcc-4_7-branch/gcc/incpath.c 2012-04-10 10:56:02.267442207 -0700 -@@ -361,6 +361,26 @@ +--- 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) + { @@ -153,57 +199,3 @@ Index: gcc-4_7-branch/gcc/incpath.c } /* Use given -I paths for #include "..." but not #include <...>, and -Index: gcc-4_7-branch/gcc/Makefile.in -=================================================================== ---- gcc-4_7-branch.orig/gcc/Makefile.in 2012-04-10 10:54:05.000000000 -0700 -+++ gcc-4_7-branch/gcc/Makefile.in 2012-04-10 10:56:02.267442207 -0700 -@@ -2065,7 +2065,7 @@ - - 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 \ -Index: gcc-4_7-branch/gcc/configure -=================================================================== ---- gcc-4_7-branch.orig/gcc/configure 2012-04-10 10:55:32.000000000 -0700 -+++ gcc-4_7-branch/gcc/configure 2012-04-10 10:56:12.183442720 -0700 -@@ -914,6 +914,7 @@ - with_system_zlib - enable_maintainer_mode - enable_version_specific_runtime_libs -+enable_poison_system_directories - enable_plugin - enable_libquadmath_support - with_linker_hash_style -@@ -1627,6 +1628,8 @@ - --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 -@@ -27075,6 +27078,19 @@ - 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 - - |