summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-12-06 21:40:28 +0000
committerMike Frysinger <vapier@gentoo.org>2011-12-06 21:40:28 +0000
commit062d4aadad286893b339e00e2a60ed8f76892300 (patch)
treeb3320477bc7ddae070e659ed33ae9fc5bb968c2e /sys-devel
parentbackport x32 support to 4.6.2+ until 4.7.0+ is released (diff)
downloadgentoo-2-062d4aadad286893b339e00e2a60ed8f76892300.tar.gz
gentoo-2-062d4aadad286893b339e00e2a60ed8f76892300.tar.bz2
gentoo-2-062d4aadad286893b339e00e2a60ed8f76892300.zip
Add x32 ABI backport (for x86-64 targets) from gcc-4.7.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gcc/ChangeLog5
-rw-r--r--sys-devel/gcc/gcc-4.6.2.ebuild9
2 files changed, 11 insertions, 3 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index f1846002d3d7..9ffa1e4bab62 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-devel/gcc
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.842 2011/12/06 16:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.843 2011/12/06 21:40:28 vapier Exp $
+
+ 06 Dec 2011; Mike Frysinger <vapier@gentoo.org> gcc-4.6.2.ebuild:
+ Add x32 ABI backport (for x86-64 targets) from gcc-4.7.
06 Dec 2011; Mike Frysinger <vapier@gentoo.org> metadata.xml:
Add description for new USE=libssp flag.
diff --git a/sys-devel/gcc/gcc-4.6.2.ebuild b/sys-devel/gcc/gcc-4.6.2.ebuild
index 54ac9f5b236b..55e058cfee0a 100644
--- a/sys-devel/gcc/gcc-4.6.2.ebuild
+++ b/sys-devel/gcc/gcc-4.6.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.2.ebuild,v 1.4 2011/12/06 01:04:08 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.2.ebuild,v 1.5 2011/12/06 21:40:28 vapier Exp $
-PATCH_VER="1.1"
+PATCH_VER="1.2"
UCLIBC_VER="1.0"
# Hardened gcc 4 stuff
@@ -42,6 +42,11 @@ src_unpack() {
EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
fi
+ # drop the x32 stuff once 4.7 goes stable
+ case ${CHOST} in
+ x86_64*) has x32 $(get_all_abis) || EPATCH_EXCLUDE+=" 80_all_gcc-4.6-x32.patch" ;;
+ esac
+
toolchain_src_unpack
use vanilla && return 0