| 1 |
vapier 11/12/03 20:43:51 |
| 2 |
|
| 3 |
Modified: toolchain.eclass |
| 4 |
Log: |
| 5 |
delete unused HTB_EXCLUSIVE variable, and drop old do_gcc_stub logic which is used only with <gcc-4.1 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.488 eclass/toolchain.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.488&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.488&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.487&r2=1.488 |
| 13 |
|
| 14 |
Index: toolchain.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
| 17 |
retrieving revision 1.487 |
| 18 |
retrieving revision 1.488 |
| 19 |
diff -u -r1.487 -r1.488 |
| 20 |
--- toolchain.eclass 3 Dec 2011 02:06:31 -0000 1.487 |
| 21 |
+++ toolchain.eclass 3 Dec 2011 20:43:51 -0000 1.488 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2011 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.487 2011/12/03 02:06:31 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.488 2011/12/03 20:43:51 vapier Exp $ |
| 27 |
# |
| 28 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 29 |
|
| 30 |
@@ -1945,27 +1945,8 @@ |
| 31 |
done |
| 32 |
} |
| 33 |
|
| 34 |
-# Try to apply some stub patches so that gcc won't error out when |
| 35 |
-# passed parameters like -fstack-protector but no ssp is found |
| 36 |
-do_gcc_stub() { |
| 37 |
- local v stub_patch="" |
| 38 |
- for v in ${GCC_RELEASE_VER} ${GCC_BRANCH_VER} ; do |
| 39 |
- stub_patch=${GCC_FILESDIR}/stubs/gcc-${v}-$1-stub.patch |
| 40 |
- if [[ -e ${stub_patch} ]] && ! use vanilla ; then |
| 41 |
- EPATCH_SINGLE_MSG="Applying stub patch for $1 ..." \ |
| 42 |
- epatch "${stub_patch}" |
| 43 |
- return 0 |
| 44 |
- fi |
| 45 |
- done |
| 46 |
-} |
| 47 |
- |
| 48 |
do_gcc_HTB_patches() { |
| 49 |
- if ! want_boundschecking || \ |
| 50 |
- (want_ssp && [[ ${HTB_EXCLUSIVE} == "true" ]]) |
| 51 |
- then |
| 52 |
- do_gcc_stub htb |
| 53 |
- return 0 |
| 54 |
- fi |
| 55 |
+ want_boundschecking || return 0 |
| 56 |
|
| 57 |
# modify the bounds checking patch with a regression patch |
| 58 |
epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch" |
| 59 |
@@ -1975,11 +1956,7 @@ |
| 60 |
# patch in ProPolice Stack Smashing protection |
| 61 |
do_gcc_SSP_patches() { |
| 62 |
# PARISC has no love ... it's our stack :( |
| 63 |
- if [[ $(tc-arch) == "hppa" ]] || \ |
| 64 |
- ! want_ssp || \ |
| 65 |
- (want_boundschecking && [[ ${HTB_EXCLUSIVE} == "true" ]]) |
| 66 |
- then |
| 67 |
- do_gcc_stub ssp |
| 68 |
+ if [[ $(tc-arch) == "hppa" ]] || ! want_ssp ; then |
| 69 |
return 0 |
| 70 |
fi |
| 71 |
|
| 72 |
@@ -2062,11 +2039,7 @@ |
| 73 |
|
| 74 |
# do various updates to PIE logic |
| 75 |
do_gcc_PIE_patches() { |
| 76 |
- if ! want_pie || \ |
| 77 |
- (want_boundschecking && [[ ${HTB_EXCLUSIVE} == "true" ]]) |
| 78 |
- then |
| 79 |
- return 0 |
| 80 |
- fi |
| 81 |
+ want_pie || return 0 |
| 82 |
|
| 83 |
want_boundschecking \ |
| 84 |
&& rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-no.patch* \ |
Archives