diff options
Diffstat (limited to 'gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch')
| -rw-r--r-- | gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch b/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch index 6700f50..a1f1cd1 100644 --- a/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch +++ b/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch @@ -1,14 +1,14 @@ -2010-04-25 Magnus Granberg <zorry@gentoo.org> Anthony G. Basile <basile@opensource.dyc.edu> +2011-12-06 Magnus Granberg <zorry@gentoo.org> Anthony G. Basile <basile@opensource.dyc.edu> * Makefile.in We add -fno-stack-protector to BOOT_CFLAGS, LIBCFLAGS and LIBCXXFLAGS if enable_esp yes. * gcc/Makefile.in Add -fno-PIE and -fno-stack-protector. Libgcc2 doesn't compile with -fstack-protector. Crtstuff doesn't compile with -fPIE and -fstack-protector. $(out_object_file): ix86_split_to_parts() stack smashing attack b.g.o #149292. - Add crtbeginTS.o to EXTRA_PARTS if enable_crtbeginTS yes - We add new file crtbeginTS.o if enable_crtbeginTS yes - * libgcc/Makefile.in Add crtbeginTS.o to EXTRA_PARTS if enable_crtbeginTS yes - We add new file crtbeginTS.o if enable_crtbeginTS yes + Add crtbeginÅ.o to EXTRA_PARTS if enable_crtbeginP yes + We add new file crtbeginP.o if enable_crtbeginP yes + * libgcc/Makefile.in Add crtbeginP.o to EXTRA_PARTS if enable_crtbeginP yes + We add new file crtbeginP.o if enable_crtbeginP yes 2010-04-25 Magnus Granberg <zorry@gentoo.org>, Kees Cook <kees@outflux.net> @@ -90,10 +90,10 @@ # The rules for compiling them should be in the t-* file for the machine. EXTRA_PARTS = @extra_parts@ -+# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes -+enable_crtbeginTS = @enable_crtbeginTS@ -+ifeq ($(enable_crtbeginTS),yes) -+EXTRA_PARTS += crtbeginTS.o ++# We add crtbeginP.o to the EXTRA_PARTS list if enable_crtbeginP = yes ++enable_crtbeginP = @enable_crtbeginP@ ++ifeq ($(enable_crtbeginP),yes) ++EXTRA_PARTS += crtbeginP.o +endif + # List of extra object files that should be compiled and linked with @@ -107,7 +107,7 @@ + echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS) $(ESP_NOPIE_CFLAGS)' >> tmp-libgcc.mvars echo CRTSTUFF_T_CFLAGS_S = '$(CRTSTUFF_T_CFLAGS_S)' >> tmp-libgcc.mvars echo TARGET_SYSTEM_ROOT = '$(TARGET_SYSTEM_ROOT)' >> tmp-libgcc.mvars -+ echo enable_crtbeginTS = '$(enable_crtbeginTS)' >> tmp-libgcc.mvars ++ echo enable_crtbeginP = '$(enable_crtbeginP)' >> tmp-libgcc.mvars mv tmp-libgcc.mvars libgcc.mvars @@ -135,12 +135,12 @@ -o $(T)crtbeginT$(objext) +# This is a version of crtbegin for -static -fPIE links if esp is enable. -+ifeq ($(enable_crtbeginTS),yes) -+$(T)crtbeginTS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \ ++ifeq ($(enable_crtbeginP),yes) ++$(T)crtbeginP.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \ + gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H) + $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \ + -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O \ -+ -o $(T)crtbeginTS$(objext) ++ -o $(T)crtbeginP$(objext) +endif + # Compile the start modules crt0.o and mcrt0.o that are linked with @@ -152,10 +152,10 @@ gen-hide-list = echo > \$@ endif -+# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes -+enable_libgcc_crtbeginTS = $(enable_crtbeginTS) -+ifeq ($(enable_libgcc_crtbeginTS),yes) -+EXTRA_PARTS += crtbeginTS.o ++# We add crtbeginP.o to the EXTRA_PARTS list if enable_crtbeginP = yes ++enable_libgcc_crtbeginP = $(enable_crtbeginP) ++ifeq ($(enable_libgcc_crtbeginP),yes) ++EXTRA_PARTS += crtbeginP.o +endif + ifneq ($(EXTRA_PARTS),) @@ -167,8 +167,8 @@ -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O + +# This is a version of crtbegin for -static -fPIE links. -+ifeq ($(enable_libgcc_crtbeginTS),yes) -+crtbeginTS.o: $(gcc_srcdir)/crtstuff.c ++ifeq ($(enable_libgcc_crtbeginP),yes) ++crtbeginP.o: $(gcc_srcdir)/crtstuff.c + $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \ + -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O +endif |