summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2013-05-15 00:55:21 +0000
committerRyan Hill <dirtyepic@gentoo.org>2013-05-15 00:55:21 +0000
commit5abb095693738f04e50a5f25c65640759bb39b65 (patch)
tree76bd8b22eb48ca2170237639f0e9b293ae69cb98 /eclass
parentVersion bump (diff)
downloadgentoo-2-5abb095693738f04e50a5f25c65640759bb39b65.tar.gz
gentoo-2-5abb095693738f04e50a5f25c65640759bb39b65.tar.bz2
gentoo-2-5abb095693738f04e50a5f25c65640759bb39b65.zip
Add lto USE flag for all versions. Drop LTO support for 4.5.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/toolchain.eclass14
2 files changed, 7 insertions, 12 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 9450b49da542..18de2c465cef 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.821 2013/05/14 17:33:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.822 2013/05/15 00:55:21 dirtyepic Exp $
+
+ 15 May 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
+ Add lto USE flag for all versions that support it. Drop LTO support for 4.5.
14 May 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass,
multilib-build.eclass:
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b22fc7708a3f..66d77db68447 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.587 2013/05/14 18:46:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.588 2013/05/15 00:55:21 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -114,7 +114,7 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
tc_version_is_at_least "4.2" && IUSE+=" openmp"
tc_version_is_at_least "4.3" && IUSE+=" fixed-point"
tc_version_is_at_least "4.6" && IUSE+=" graphite"
- [[ ${GCC_BRANCH_VER} == 4.5 ]] && IUSE+=" lto"
+ tc_version_is_at_least "4.6" && IUSE+=" lto"
tc_version_is_at_least "4.7" && IUSE+=" go"
fi
fi
@@ -144,7 +144,6 @@ if tc_version_is_at_least 4 ; then
if tc_version_is_at_least 4.5 ; then
RDEPEND+=" >=dev-libs/mpc-0.8.1"
fi
- in_iuse lto && RDEPEND+=" lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) )"
fi
if in_iuse graphite ; then
if tc_version_is_at_least 4.8 ; then
@@ -1096,14 +1095,7 @@ gcc_do_configure() {
confgcc+=" --without-ppl"
fi
- # LTO support was added in 4.5, which depends upon elfutils. This allows
- # users to enable that option, and pull in the additional library. In 4.6,
- # the dependency is no longer required.
- if tc_version_is_at_least "4.6" ; then
- confgcc+=" --enable-lto"
- elif tc_version_is_at_least "4.5" ; then
- confgcc+=" $(use_enable lto)"
- fi
+ tc_version_is_at_least "4.6" && confgcc+=" $(use_enable lto)"
case $(tc-is-softfloat) in
yes) confgcc+=" --with-float=soft" ;;