From: Christopher Larson <chris_larson@mentor.com>
Date: Wed, 14 Dec 2016 03:00:35 +0000 (-0700)
Subject: gnu-efi: build 64-bit for x32
X-Git-Tag: uninative-1.5~923
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=24325410acb670a3e7bc626ac3607efa8df38dc5;p=openembedded-core.git

gnu-efi: build 64-bit for x32

We're targeting the x86_64 EFI ABI.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
index 9ddc4ba716..e55ab7f059 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
@@ -52,3 +52,12 @@ BBCLASSEXTEND = "native"
 # CFLAGS += -mno-mmx -mno-sse
 # So also remove -mfpmath=sse from TUNE_CCARGS
 TUNE_CCARGS_remove = "-mfpmath=sse"
+
+python () {
+    ccargs = d.getVar('TUNE_CCARGS', True).split()
+    if '-mx32' in ccargs:
+        # use x86_64 EFI ABI
+        ccargs.remove('-mx32')
+        ccargs.append('-m64')
+        d.setVar('TUNE_CCARGS', ' '.join(ccargs))
+}