add norelro patch for uclibc

6 files changed, 26 insertions, 10 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index bbf97182ebe5..496ee448f26f 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.277 2004/06/28 22:04:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.278 2004/06/29 14:05:26 solar Exp $
+
+  29 Jun 2004; <solar@gentoo.org> gcc-3.3.3-r6.ebuild, gcc-3.3.4.ebuild,
+  gcc-3.4.0-r6.ebuild, files/3.3.3/gcc-3.3.3-norelro.patch:
+  add norelro patch for uclibc
 
   28 Jun 2004; <solar@gentoo.org> gcc-3.4.0-r6.ebuild:
   fwdport uclibc updates from 3.3.4
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 3567b9a925cc..83fd706a3023 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,5 +1,5 @@
 MD5 abbd279136ef0d17a5de7fd76a287d1d gcc-3.3.2-r3.ebuild 20338
-MD5 2a4b2befab58505cef14438135d9df04 gcc-3.3.4.ebuild 25823
+MD5 ce8b33bb1fc48e74ef5bf3ac982dba2a gcc-3.3.4.ebuild 25829
 MD5 7585d298ccecd46e16850c17f7f94938 gcc-3.2.3-r4.ebuild 19680
 MD5 3175d7dd9284d0808ebe8a27441c886f gcc-3.3-r1.ebuild 16398
 MD5 0dd99129d0a9d182176238514d39bf9b gcc-3.3.3_pre20040130.ebuild 21367
@@ -15,8 +15,8 @@ MD5 cb7bb7fc3f72829d05fb759e5656b9c2 gcc-3.3.2-r2.ebuild 17967
 MD5 fa64b2fbafa1f3a278437a75ae88f57d gcc-3.3.3.ebuild 22233
 MD5 e207d7c810c120650c636aca8b1deac0 gcc-3.3.1-r5.ebuild 17718
 MD5 bc96f5c6a535080b17efea10f8b6028b gcc-3.0.4-r6.ebuild 8454
-MD5 52dc9cc545e52708681abf5e7f79e008 gcc-3.3.3-r6.ebuild 25960
-MD5 507bde023f3f63425c7c0c3994949468 gcc-3.4.0-r6.ebuild 30092
+MD5 ebbace076e3fd8046f9c8c273f533a3a gcc-3.3.3-r6.ebuild 25966
+MD5 8e45c52e06af860afdff48a127dec4fb gcc-3.4.0-r6.ebuild 30098
 MD5 970f4ad9e1059dfab7bd2fa0a98690d2 gcc-3.3.2-r4.ebuild 20592
 MD5 2f948cf43c68a4a49c20b71b3fa440ef gcc-2.95.3-r8.ebuild 9102
 MD5 8c3e2040f108489f54f528369942868f gcc-3.3.3-r3.ebuild 24571
@@ -96,6 +96,7 @@ MD5 308a0e53f03e9cb74b3d12c2633cbee2 files/3.3.3/gcc-uclibc-3.3-loop.patch 433
 MD5 0e8d94bbc14fbb3fbad1df4f404b39ef files/3.3.3/gcc333-ssp-3.3_7-fixup.patch 2616
 MD5 43c60f04779324d74d3aac52224bed95 files/3.3.3/gcc333_pre20040408-gentoo-branding.patch 820
 MD5 bb0078854a778b2a279cfb15d8933c29 files/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch 2598
+MD5 ee700275f341541af37d56bd15dcf863 files/3.3.3/gcc-3.3.3-norelro.patch 606
 MD5 f317331e0b196ca455ca9554479cd8eb files/3.3.3/gcc333_pre20040322-gentoo-branding.patch 817
 MD5 9ba0bd0b103cf9535927ad7c482fe780 files/3.3.3/gcc333-debian-arm-getoff.patch 3501
 MD5 ff6d7b5082c5e39fab8a5d8932c1a8b7 files/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch 461
diff --git a/sys-devel/gcc/files/3.3.3/gcc-3.3.3-norelro.patch b/sys-devel/gcc/files/3.3.3/gcc-3.3.3-norelro.patch
new file mode 100644
index 000000000000..8da6d30168a5
--- /dev/null
+++ b/sys-devel/gcc/files/3.3.3/gcc-3.3.3-norelro.patch
@@ -0,0 +1,11 @@
+--- gcc-3.3.3/gcc/pie-ssp-chain.h.mps	2004-06-14 22:18:40.000000000 +0200
++++ gcc-3.3.3/gcc/pie-ssp-chain.h	2004-06-14 22:19:04.000000000 +0200
+@@ -85,7 +85,7 @@
+ #endif
+ 
+ #ifdef HAVE_LD_PIE
+-#define LINK_PIE_SPEC STD_PIE_TRIGGER( LNK_CHAIN_EXCLUDE( PIE_CHAIN_EXCLUDE(LINKSEC_PIE_LNK) ) ) " " OPP_PIE_TRIGGER() " " STD_RELRO_TRIGGER(LINKSEC_RELRO_LNK) " " OPP_RELRO_TRIGGER() " " STD_NOW_TRIGGER(LINKSEC_NOW_LNK) " " OPP_NOW_TRIGGER()
++#define LINK_PIE_SPEC STD_PIE_TRIGGER( LNK_CHAIN_EXCLUDE( PIE_CHAIN_EXCLUDE(LINKSEC_PIE_LNK) ) ) " " OPP_PIE_TRIGGER()
+ #else
+ #error we need ld w/ -pie support
+ #endif
diff --git a/sys-devel/gcc/gcc-3.3.3-r6.ebuild b/sys-devel/gcc/gcc-3.3.3-r6.ebuild
index 618d7f8a6ac4..ea80affb2b8e 100644
--- a/sys-devel/gcc/gcc-3.3.3-r6.ebuild
+++ b/sys-devel/gcc/gcc-3.3.3-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r6.ebuild,v 1.9 2004/06/24 22:58:25 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r6.ebuild,v 1.10 2004/06/29 14:05:27 solar Exp $
 
 IUSE="static nls bootstrap java build X multilib gcj f77 objc pic hardened uclibc debug"
 
@@ -349,7 +349,7 @@ src_unpack() {
 		# adds default pie support for all archs less rs6000 if DEFAULT_PIE[_SSP] is defined
 		epatch ${WORKDIR}/piepatch/def
 		# disable relro/now
-		use uclibc && epatch ${FILESDIR}/gcc-3.3.3-norelro.patch
+		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
 	fi
 
 	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
diff --git a/sys-devel/gcc/gcc-3.3.4.ebuild b/sys-devel/gcc/gcc-3.3.4.ebuild
index 349a06c87b76..e10d63ed4a00 100644
--- a/sys-devel/gcc/gcc-3.3.4.ebuild
+++ b/sys-devel/gcc/gcc-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4.ebuild,v 1.4 2004/06/27 18:26:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4.ebuild,v 1.5 2004/06/29 14:05:27 solar Exp $
 
 IUSE="static nls bootstrap build X multilib gcj f77 objc pic hardened uclibc debug"
 
@@ -348,7 +348,7 @@ src_unpack() {
 		# adds default pie support for all archs less rs6000 if DEFAULT_PIE[_SSP] is defined
 		epatch ${WORKDIR}/piepatch/def
 		# disable relro/now
-		use uclibc && epatch ${FILESDIR}/gcc-3.3.3-norelro.patch
+		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
 	fi
 
 	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
diff --git a/sys-devel/gcc/gcc-3.4.0-r6.ebuild b/sys-devel/gcc/gcc-3.4.0-r6.ebuild
index b5baf2af2a85..e642cb4d0eba 100644
--- a/sys-devel/gcc/gcc-3.4.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-3.4.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r6.ebuild,v 1.13 2004/06/28 22:04:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r6.ebuild,v 1.14 2004/06/29 14:05:27 solar Exp $
 
 IUSE="static nls bootstrap java build X multilib gcj f77 objc hardened uclibc n32 n64"
 
@@ -427,7 +427,7 @@ src_unpack() {
 		# adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
 		epatch ${WORKDIR}/piepatch/def
 		# disable relro/now
-		use uclibc && epatch ${FILESDIR}/gcc-3.3.3-norelro.patch
+		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
 	fi
 
 	# non-default SSP support.