[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

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

vapier      14/01/17 06:21:15

  Modified:             multilib.eclass
  Log:
  multilib_env: add aarch64 details

Revision  Changes    Path
1.104                eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.103&r2=1.104

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- multilib.eclass	22 Apr 2013 01:18:51 -0000	1.103
+++ multilib.eclass	17 Jan 2014 06:21:15 -0000	1.104
@@ -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/multilib.eclass,v 1.103 2013/04/22 01:18:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.104 2014/01/17 06:21:15 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -280,8 +280,28 @@
 # a crosscompiler (and thus they aren't set in the profile)
 multilib_env() {
 	local CTARGET=${1:-${CTARGET}}
+	local cpu=${CTARGET%%*-}
 
-	case ${CTARGET} in
+	case ${cpu} in
+		aarch64*)
+			# Not possible to do multilib with aarch64 and a single toolchain.
+			export CFLAGS_arm=${CFLAGS_arm-}
+			case ${cpu} in
+			aarch64*be) export CHOST_arm="armv8b-${CTARGET#*-}";;
+			*)          export CHOST_arm="armv8l-${CTARGET#*-}";;
+			esac
+			CHOST_arm=${CHOST_arm/%-gnu/-gnueabi}
+			export CTARGET_arm=${CHOST_arm}
+			export LIBDIR_arm="lib"
+
+			export CFLAGS_aarch64=${CFLAGS_aarch64-}
+			export CHOST_aarch64=${CTARGET}
+			export CTARGET_aarch64=${CHOST_aarch64}
+			export LIBDIR_aarch64="lib64"
+
+			: ${MULTILIB_ABIS=aarch64}
+			: ${DEFAULT_ABI=aarch64}
+		;;
 		x86_64*)
 			export CFLAGS_x86=${CFLAGS_x86--m32}
 			export CHOST_x86=${CTARGET/x86_64/i686}