[gentoo-commits] gentoo-x86 commit in profiles/arch/amd64: ChangeLog make.defaults

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      11/12/07 19:23:46

  Modified:             ChangeLog make.defaults
  Log:
  Add settings for x32 ABI, and make amd64 explicit in case it is not the default ABI.

Revision  Changes    Path
1.156                profiles/arch/amd64/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/amd64/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/amd64/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/amd64/ChangeLog?r1=1.155&r2=1.156

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog	29 Nov 2011 23:44:51 -0000	1.155
+++ ChangeLog	7 Dec 2011 19:23:45 -0000	1.156
@@ -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.



1.10                 profiles/arch/amd64/make.defaults

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/amd64/make.defaults?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/amd64/make.defaults?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/amd64/make.defaults?r1=1.9&r2=1.10

Index: make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- make.defaults	14 Oct 2011 22:52:01 -0000	1.9
+++ make.defaults	7 Dec 2011 19:23:45 -0000	1.10
@@ -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 @@
 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 @@
 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