diff options
| author | Caroline Tice <cmtice@google.com> | 2016-02-10 14:40:41 -0800 |
|---|---|---|
| committer | Caroline Tice <cmtice@google.com> | 2016-02-26 08:25:55 -0800 |
| commit | 817a788f9eb01eff367191401d48f2aaa8d4f428 (patch) | |
| tree | 637f745404b37fbf3fcff629227d7d542725e5fe /gcc-4.9/gcc/gcc.c | |
| parent | a4ca82cac69c3147143d7b4b4d7cdeb5e02f20ef (diff) | |
| download | toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.gz toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.bz2 toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.zip | |
Unify ChromeOS and Android versions of GCC.
This CL updates Android's GCC to match ChromeOS's GCC (with
appropriate patches applied in both places to make sure no
cherry-picked changes are lost).
Change-Id: I390140c449b0e5df9ee78a06268319c8c510302f
Diffstat (limited to 'gcc-4.9/gcc/gcc.c')
| -rw-r--r-- | gcc-4.9/gcc/gcc.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gcc-4.9/gcc/gcc.c b/gcc-4.9/gcc/gcc.c index e187cd19c..cc717820d 100644 --- a/gcc-4.9/gcc/gcc.c +++ b/gcc-4.9/gcc/gcc.c @@ -751,6 +751,19 @@ proper position among the other output files. */ %{fvtable-verify=preinit: -lvtv -u_vtable_map_vars_start -u_vtable_map_vars_end}}" #endif +#if POISON_SYSTEM_DIRECTORIES_DEFAULT +# define POISON_SYSTEM_DIRECTORIES_DEFAULT_SPEC "\ +%{!Wpoison-system-directories:%{!Wno-poison-system-directories:\ + --warn-poison-system-directories}}" +#else +# define POISON_SYSTEM_DIRECTORIES_DEFAULT_SPEC "" +#endif +#define POISON_SYSTEM_DIRECTORIES_SPEC \ + POISON_SYSTEM_DIRECTORIES_DEFAULT_SPEC " \ + %{Wpoison-system-directories:--warn-poison-system-directories}\ + %{Wno-poison-system-directories:--no-warn-poison-system-directories}\ + %{Werror=poison-system-directories:--error-poison-system-directories}" + /* -u* was put back because both BSD and SysV seem to support it. */ /* %{static:} simply prevents an error message if the target machine doesn't handle -static. */ @@ -773,6 +786,7 @@ 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}} " VTABLE_VERIFICATION_SPEC " \ + " POISON_SYSTEM_DIRECTORIES_SPEC " \ %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\ %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\ %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ |