From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sat, 19 Oct 2019 11:42:41 +0000 (+0100)
Subject: toolchain.eclass: drop PIE patch support for <gcc-4.2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c41f3cee36633d1e425d611ed63e3f35e0aaaeb4;p=gentoo.git

toolchain.eclass: drop PIE patch support for <gcc-4.2

::gentoo and ::toolchain don't have any ebuilds using PIE patchset.
If someone really needs to resurrect these old patches it's easier
to reshuffle the patchset itself.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 0c0378d9a7e4..ec196db072d9 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -649,23 +649,9 @@ do_gcc_PIE_patches() {
 	want_pie || return 0
 	use vanilla && return 0
 
-	if tc_version_is_at_least 4.3.2 ; then
-		guess_patch_type_in_dir "${WORKDIR}"/piepatch/
-		EPATCH_MULTI_MSG="Applying pie patches ..." \
-		epatch "${WORKDIR}"/piepatch/
-	else
-		guess_patch_type_in_dir "${WORKDIR}"/piepatch/upstream
-
-		# corrects startfile/endfile selection and shared/static/pie flag usage
-		EPATCH_MULTI_MSG="Applying upstream pie patches ..." \
-		epatch "${WORKDIR}"/piepatch/upstream
-		# adds non-default pie support (rs6000)
-		EPATCH_MULTI_MSG="Applying non-default pie patches ..." \
-		epatch "${WORKDIR}"/piepatch/nondef
-		# adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
-		EPATCH_MULTI_MSG="Applying default pie patches ..." \
-		epatch "${WORKDIR}"/piepatch/def
-	fi
+	guess_patch_type_in_dir "${WORKDIR}"/piepatch/
+	EPATCH_MULTI_MSG="Applying pie patches ..." \
+	epatch "${WORKDIR}"/piepatch/
 
 	BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}"
 }