diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-12-07 19:23:45 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-07 19:23:45 +0000 |
| commit | 4d0328082541f6b25d594d3c84969aef8677c9dc (patch) | |
| tree | e60549f83e1ad5277dc45f753d9ac728ffcd0c64 /profiles/arch | |
| parent | merge standard mips LIBDIR settings, and add amd64 x32 abi settings, and sort... (diff) | |
| download | gentoo-2-4d0328082541f6b25d594d3c84969aef8677c9dc.tar.gz gentoo-2-4d0328082541f6b25d594d3c84969aef8677c9dc.tar.bz2 gentoo-2-4d0328082541f6b25d594d3c84969aef8677c9dc.zip | |
Add settings for x32 ABI, and make amd64 explicit in case it is not the default ABI.
Diffstat (limited to 'profiles/arch')
| -rw-r--r-- | profiles/arch/amd64/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/arch/amd64/make.defaults | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog index aaab535c25f1..96216e370d48 100644 --- a/profiles/arch/amd64/ChangeLog +++ b/profiles/arch/amd64/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.155 2011/11/29 23:44:51 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.156 2011/12/07 19:23:45 vapier Exp $ + + 07 Dec 2011; Mike Frysinger <vapier@gentoo.org> make.defaults: + Add settings for x32 ABI, and make amd64 explicit in case it is not the + default ABI. 29 Nov 2011; Davide Pesavento <pesa@gentoo.org> package.use.mask: Unmask USE="jit" for qt-webkit. diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults index 65daf9de0f88..17ee4a38b98b 100644 --- a/profiles/arch/amd64/make.defaults +++ b/profiles/arch/amd64/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.9 2011/10/14 22:52:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.10 2011/12/07 19:23:45 vapier Exp $ ARCH="amd64" ACCEPT_KEYWORDS="${ARCH}" @@ -17,6 +17,8 @@ DEFAULT_ABI="amd64" ABI="amd64" # 64bit specific settings. +CFLAGS_amd64="-m64" +LDFLAGS_amd64="-m elf_x86_64" CHOST_amd64="x86_64-pc-linux-gnu" # 32bit specific settings. @@ -24,6 +26,11 @@ CFLAGS_x86="-m32" LDFLAGS_x86="-m elf_i386" CHOST_x86="i686-pc-linux-gnu" +# 64-32bit specific settings. +CFLAGS_x32="-mx32" +LDFLAGS_x32="-m elf32_x86_64" +CHOST_x32="x86_64-pc-linux-gnu" + # 2006/10/24 - Simon Stelling <blubb@gentoo.org> # They are masked, but we can enable them anyway for those who have # >=portage-2.1.2_pre3-r4 |