diff options
| -rw-r--r-- | sys-devel/gcc/Manifest | 2 | ||||
| -rw-r--r-- | sys-devel/gcc/files/3.2.2/gcc-322-r3-propolice-version.patch | 17 | ||||
| -rw-r--r-- | sys-devel/gcc/files/3.2.2/protector_parallel_make.patch | 10 | ||||
| -rw-r--r-- | sys-devel/gcc/files/3.2.3/protector-3.2.2-6-PPC.patch | 13 | ||||
| -rw-r--r-- | sys-devel/gcc/files/digest-gcc-3.3 | 1 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.3.ebuild | 3 |
6 files changed, 2 insertions, 44 deletions
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 12f561c3a771..829d46dc3593 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -1,5 +1,5 @@ MD5 63530786ea42df2b5ca6e52999f586f2 gcc-2.95.3-r7.ebuild 5464 -MD5 ee3a8d1368b31ac292b8dfa4eedef9d1 gcc-3.3.ebuild 16107 +MD5 a529ffdc873df8e9348fdb2ac3b92be6 gcc-3.3.ebuild 16106 MD5 5568b4e0eb60ef6580354c68141ef0b1 gcc-3.2.3-r1.ebuild 16125 MD5 feed532ddfb47b382cd79f924d8578db manifest 7147 MD5 857d79065f68cdc820201acbeb5c10ac gcc-3.2.1-r7.ebuild 14840 diff --git a/sys-devel/gcc/files/3.2.2/gcc-322-r3-propolice-version.patch b/sys-devel/gcc/files/3.2.2/gcc-322-r3-propolice-version.patch deleted file mode 100644 index 26f157b01acb..000000000000 --- a/sys-devel/gcc/files/3.2.2/gcc-322-r3-propolice-version.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- gcc/version.c.old 2003-03-26 10:43:47.000000000 -0500 -+++ gcc/version.c 2003-03-26 10:44:13.000000000 -0500 -@@ -1,4 +1,4 @@ - #include "ansidecl.h" - #include "version.h" - --const char *const version_string = "3.2.2 20030322 (Gentoo Linux 1.4 3.2.2-r2)"; -+const char *const version_string = "3.2.2 20030322 (Gentoo Linux 1.4 3.2.2-r3, propolice)"; - ---- gcc/f/version.c.old 2003-03-26 10:43:54.000000000 -0500 -+++ gcc/f/version.c 2003-03-26 10:44:27.000000000 -0500 -@@ -1,4 +1,4 @@ - #include "ansidecl.h" - #include "f/version.h" - --const char *const ffe_version_string = "3.2.2 20030322 (Gentoo Linux 1.4 3.2.2-r2)"; -+const char *const ffe_version_string = "3.2.2 20030322 (Gentoo Linux 1.4 3.2.2-r3, propolice)"; diff --git a/sys-devel/gcc/files/3.2.2/protector_parallel_make.patch b/sys-devel/gcc/files/3.2.2/protector_parallel_make.patch deleted file mode 100644 index d83cde1cdc1c..000000000000 --- a/sys-devel/gcc/files/3.2.2/protector_parallel_make.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gcc/Makefile.in.old 2003-04-25 01:09:03.000000000 -0400 -+++ gcc/Makefile.in 2003-04-25 01:09:57.000000000 -0400 -@@ -1592,6 +1592,7 @@ - $(C_COMMON_H) flags.h varray.h $(EXPR_H) - params.o : params.c $(CONFIG_H) $(SYSTEM_H) $(PARAMS_H) toplev.h - hooks.o: hooks.c $(CONFIG_H) $(SYSTEM_H) $(HOOKS_H) -+protector.o : protector.c $(CONFIG_H) - - $(out_object_file): $(out_file) $(CONFIG_H) $(TREE_H) $(GGC_H) \ - $(RTL_H) $(REGS_H) hard-reg-set.h real.h insn-config.h conditions.h \ diff --git a/sys-devel/gcc/files/3.2.3/protector-3.2.2-6-PPC.patch b/sys-devel/gcc/files/3.2.3/protector-3.2.2-6-PPC.patch deleted file mode 100644 index 6706c8c01904..000000000000 --- a/sys-devel/gcc/files/3.2.3/protector-3.2.2-6-PPC.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- protector.c 2003-03-11 10:16:52.000000000 +0200 -+++ protector.c 2003-04-26 02:43:53.000000000 +0200 -@@ -2004,7 +2004,9 @@ - insn_pushed = FALSE; debuginsn = insn; - push_frame_in_operand (insn, PATTERN (insn), push_size, boundary); - -- if (insn_pushed) -+ if (insn_pushed -+ /* skip if it is called from purge_address_of */ -+ && cse_not_expected) - { - rtx after = insn; - rtx seq = split_insns (PATTERN (insn), insn); diff --git a/sys-devel/gcc/files/digest-gcc-3.3 b/sys-devel/gcc/files/digest-gcc-3.3 index 7220fbe008d6..02e12d7e21fc 100644 --- a/sys-devel/gcc/files/digest-gcc-3.3 +++ b/sys-devel/gcc/files/digest-gcc-3.3 @@ -1,5 +1,4 @@ MD5 39147717455d8dba4d43d1b058ea46e2 gcc-3.3.tar.bz2 23447616 MD5 ad23b671345a197cca3d4685e3a97d17 gcc-3.3-patches-1.1.tar.bz2 39336 -MD5 1110bc0bb3196bc37c0cc347e43e4f83 protector-3.2.2-7.tar.gz 24190 MD5 f838ebcbd0b599c0a0e8a6b6770bba75 gcc-3.3-athlon-hammer-branch-20030515.patch.bz2 227731 MD5 d9ffc20ae7c26008b7f66fdcdce07f0f gcc-3.3-manpages.tar.bz2 136727 diff --git a/sys-devel/gcc/gcc-3.3.ebuild b/sys-devel/gcc/gcc-3.3.ebuild index e9df72f7eeb0..2d9431912e39 100644 --- a/sys-devel/gcc/gcc-3.3.ebuild +++ b/sys-devel/gcc/gcc-3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.ebuild,v 1.4 2003/06/22 05:30:30 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.ebuild,v 1.5 2003/07/14 18:15:27 frogger Exp $ IUSE="static nls bootstrap java build X" @@ -203,7 +203,6 @@ src_unpack() { then # ProPolice Stack Smashing protection - protector-3.2.2-7 epatch ${WORKDIR}/protector.dif - epatch ${FILESDIR}/3.2.2/protector_parallel_make.patch cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found" cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found" version_patch ${FILESDIR}/3.3/gcc33-propolice-version.patch |