From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RWwRE-00035p-5z for garchives@archives.gentoo.org; Sat, 03 Dec 2011 20:44:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A70D21C022; Sat, 3 Dec 2011 20:43:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2E2A721C022 for ; Sat, 3 Dec 2011 20:43:53 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93F2D1B4006 for ; Sat, 3 Dec 2011 20:43:52 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 364822004C; Sat, 3 Dec 2011 20:43:51 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: toolchain.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20111203204351.364822004C@flycatcher.gentoo.org> Date: Sat, 3 Dec 2011 20:43:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6235323e-1b93-4e1e-a62c-5c4ee1ee87ad X-Archives-Hash: 068b68062620ad22fbdb08db306e42df vapier 11/12/03 20:43:51 Modified: toolchain.eclass Log: delete unused HTB_EXCLUSIVE variable, and drop old do_gcc_stub logic wh= ich is used only with =20 @@ -1945,27 +1945,8 @@ done } =20 -# Try to apply some stub patches so that gcc won't error out when -# passed parameters like -fstack-protector but no ssp is found -do_gcc_stub() { - local v stub_patch=3D"" - for v in ${GCC_RELEASE_VER} ${GCC_BRANCH_VER} ; do - stub_patch=3D${GCC_FILESDIR}/stubs/gcc-${v}-$1-stub.patch - if [[ -e ${stub_patch} ]] && ! use vanilla ; then - EPATCH_SINGLE_MSG=3D"Applying stub patch for $1 ..." \ - epatch "${stub_patch}" - return 0 - fi - done -} - do_gcc_HTB_patches() { - if ! want_boundschecking || \ - (want_ssp && [[ ${HTB_EXCLUSIVE} =3D=3D "true" ]]) - then - do_gcc_stub htb - return 0 - fi + want_boundschecking || return 0 =20 # modify the bounds checking patch with a regression patch epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch" @@ -1975,11 +1956,7 @@ # patch in ProPolice Stack Smashing protection do_gcc_SSP_patches() { # PARISC has no love ... it's our stack :( - if [[ $(tc-arch) =3D=3D "hppa" ]] || \ - ! want_ssp || \ - (want_boundschecking && [[ ${HTB_EXCLUSIVE} =3D=3D "true" ]]) - then - do_gcc_stub ssp + if [[ $(tc-arch) =3D=3D "hppa" ]] || ! want_ssp ; then return 0 fi =20 @@ -2062,11 +2039,7 @@ =20 # do various updates to PIE logic do_gcc_PIE_patches() { - if ! want_pie || \ - (want_boundschecking && [[ ${HTB_EXCLUSIVE} =3D=3D "true" ]]) - then - return 0 - fi + want_pie || return 0 =20 want_boundschecking \ && rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-no.patch* \