diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2013-08-10 04:25:37 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2013-08-10 04:25:37 +0000 |
| commit | e4f935d47c3b4922c3028315b3eed6de667c06f3 (patch) | |
| tree | 14bae815071ac409e585c49b43a78db9f66beef5 /eclass | |
| parent | Start using readme.gentoo (diff) | |
| download | historical-e4f935d47c3b4922c3028315b3eed6de667c06f3.tar.gz historical-e4f935d47c3b4922c3028315b3eed6de667c06f3.tar.bz2 historical-e4f935d47c3b4922c3028315b3eed6de667c06f3.zip | |
Append -Wl,--no-relax to LDFLAGS on alpha for 4.6 (bug #454426 again).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 24 |
2 files changed, 19 insertions, 10 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 516b8bc492af..3b7a93e6181f 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.918 2013/08/08 22:29:21 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.919 2013/08/10 04:25:37 dirtyepic Exp $ + + 10 Aug 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: + Append -Wl,--no-relax to LDFLAGS on alpha for 4.6 (bug #454426 again). 08 Aug 2013; Michał Górny <mgorny@gentoo.org> +twisted-r1.eclass: Introduce a twisted-r1.eclass to join the python-r1 suite and replace diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index ec6db5634259..a55805ab70e9 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.597 2013/07/24 01:34:38 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.598 2013/08/10 04:25:37 dirtyepic Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1379,16 +1379,12 @@ gcc_do_make() { } gcc_do_filter_flags() { - strip-flags - # In general gcc does not like optimization, and add -O2 where + # In general gcc does not like optimization, and adds -O2 where # it is safe. This is especially true for gcc 3.3 + 3.4 replace-flags -O? -O2 - # ... sure, why not? - strip-unsupported-flags - # dont want to funk ourselves filter-flags '-mabi*' -m31 -m32 -m64 @@ -1431,12 +1427,22 @@ gcc_do_filter_flags() { case ${GCC_BRANCH_VER} in 4.6) - # https://bugs.gentoo.org/411333 - # https://bugs.gentoo.org/466454 - replace-cpu-flags c3-2 pentium2 pentium3 pentium3m pentium-m i686 + case $(tc-arch) in + alpha) + # https://bugs.gentoo.org/454426 + append-ldflags -Wl,--no-relax + ;; + amd64|x86) + # https://bugs.gentoo.org/411333 + # https://bugs.gentoo.org/466454 + replace-cpu-flags c3-2 pentium2 pentium3 pentium3m pentium-m i686 + ;; + esac ;; esac + strip-unsupported-flags + # TODO: Move to gcc_do_make() # CFLAGS logic (verified with 3.4.3): |