This avoids the SVN or git fetcher issues for gcc and the tar is mirrored around the world so it will not be slow Fixes [YOCTO #2908] (From OE-Core rev: 5e03d1e83d0536a2fc69a88d3e5407108836203f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
224 lines
8.6 KiB
Diff
224 lines
8.6 KiB
Diff
Upstream-Status: Inappropriate [distribution: codesourcery]
|
|
|
|
gcc/
|
|
2008-07-02 Joseph Myers <joseph@codesourcery.com>
|
|
* 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 <joseph@codesourcery.com>
|
|
* 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 <dan@codesourcery.com>
|
|
Joseph Myers <joseph@codesourcery.com>
|
|
* 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.
|
|
|
|
Index: gcc-4.7.2/gcc/common.opt
|
|
===================================================================
|
|
--- gcc-4.7.2.orig/gcc/common.opt 2012-08-06 07:34:27.000000000 -0700
|
|
+++ gcc-4.7.2/gcc/common.opt 2012-09-20 07:40:54.708937540 -0700
|
|
@@ -582,6 +582,10 @@
|
|
Common Var(warn_padded) Warning
|
|
Warn when padding is required to align structure members
|
|
|
|
+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
|
|
Index: gcc-4.7.2/gcc/config.in
|
|
===================================================================
|
|
--- gcc-4.7.2.orig/gcc/config.in 2012-09-20 00:23:55.000000000 -0700
|
|
+++ gcc-4.7.2/gcc/config.in 2012-09-20 07:40:54.708937540 -0700
|
|
@@ -144,6 +144,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. */
|
|
Index: gcc-4.7.2/gcc/configure.ac
|
|
===================================================================
|
|
--- gcc-4.7.2.orig/gcc/configure.ac 2012-09-20 07:30:27.000000000 -0700
|
|
+++ gcc-4.7.2/gcc/configure.ac 2012-09-20 07:40:54.708937540 -0700
|
|
@@ -4989,6 +4989,16 @@
|
|
[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)
|
|
Index: gcc-4.7.2/gcc/doc/invoke.texi
|
|
===================================================================
|
|
--- gcc-4.7.2.orig/gcc/doc/invoke.texi 2012-09-14 13:45:27.000000000 -0700
|
|
+++ gcc-4.7.2/gcc/doc/invoke.texi 2012-09-20 07:40:54.712937541 -0700
|
|
@@ -260,6 +260,7 @@
|
|
-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
|
|
-Wreturn-type -Wsequence-point -Wshadow @gol
|
|
-Wsign-compare -Wsign-conversion -Wstack-protector @gol
|
|
@@ -3879,6 +3880,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.
|
|
|
|
+@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 -Wfloat-equal
|
|
@opindex Wfloat-equal
|
|
@opindex Wno-float-equal
|
|
Index: gcc-4.7.2/gcc/gcc.c
|
|
===================================================================
|
|
--- gcc-4.7.2.orig/gcc/gcc.c 2012-08-06 07:34:27.000000000 -0700
|
|
+++ gcc-4.7.2/gcc/gcc.c 2012-09-20 07:40:54.716937541 -0700
|
|
@@ -673,6 +673,8 @@
|
|
%{flto} %{flto=*} %l " LINK_PIE_SPEC \
|
|
"%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\
|
|
%{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\
|
|
%{fgnu-tm:%:include(libitm.spec)%(link_itm)}\
|
|
Index: gcc-4.7.2/gcc/incpath.c
|
|
===================================================================
|
|
--- gcc-4.7.2.orig/gcc/incpath.c 2012-01-26 15:34:58.000000000 -0800
|
|
+++ gcc-4.7.2/gcc/incpath.c 2012-09-20 07:40:54.716937541 -0700
|
|
@@ -361,6 +361,24 @@
|
|
}
|
|
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)))
|
|
+ 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
|
|
Index: gcc-4.7.2/gcc/Makefile.in
|
|
===================================================================
|
|
--- gcc-4.7.2.orig/gcc/Makefile.in 2012-08-06 07:34:27.000000000 -0700
|
|
+++ gcc-4.7.2/gcc/Makefile.in 2012-09-20 07:40:54.716937541 -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.2/gcc/configure
|
|
===================================================================
|
|
--- gcc-4.7.2.orig/gcc/configure 2012-09-20 07:30:27.000000000 -0700
|
|
+++ gcc-4.7.2/gcc/configure 2012-09-20 07:41:08.548938066 -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
|
|
@@ -18010,7 +18013,7 @@
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 18013 "configure"
|
|
+#line 18016 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -18116,7 +18119,7 @@
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 18119 "configure"
|
|
+#line 18122 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -27129,6 +27132,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
|
|
|
|
|