From: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Date: Fri, 8 Aug 2014 16:50:45 +0200
Subject: [PATCH 1/4] Restrict GNU_EFI_USE_MS_ABI GCC version test to x86_64

The version test only applies to x86_64 builds, so no need to do it
for other archs.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Nigel Croxon <nigel.croxon@hp.com>

gnu-efi-3.0/Make.defaults

@@ -74,18 +74,6 @@ endif
 # Variables below derived from variables above
 #
 
-GCCVERSION   := $(shell $(CC) -dumpversion | cut -f1 -d.)
-GCCMINOR     := $(shell $(CC) -dumpversion | cut -f2 -d.)
-
-# Rely on GCC MS ABI support?
-GCCNEWENOUGH := $(shell ( [ $(GCCVERSION) -gt "4" ]           \
-                          || ( [ $(GCCVERSION) -eq "4" ]      \
-                               && [ $(GCCMINOR) -ge "7" ] ) ) \
-                        && echo 1)
-ifeq ($(GCCNEWENOUGH),1)
-  CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
-endif
-
 # Arch-specific compilation flags
 CPPFLAGS += -DCONFIG_$(ARCH)
 
@@ -101,6 +89,18 @@ ifeq ($(ARCH),ia32)
 endif
 
 ifeq ($(ARCH),x86_64)
+  GCCVERSION   := $(shell $(CC) -dumpversion | cut -f1 -d.)
+  GCCMINOR     := $(shell $(CC) -dumpversion | cut -f2 -d.)
+
+  # Rely on GCC MS ABI support?
+  GCCNEWENOUGH := $(shell ( [ $(GCCVERSION) -gt "4" ]           \
+                            || ( [ $(GCCVERSION) -eq "4" ]      \
+                                 && [ $(GCCMINOR) -ge "7" ] ) ) \
+                          && echo 1)
+  ifeq ($(GCCNEWENOUGH),1)
+    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
+  endif
+
   CFLAGS += -mno-red-zone -mno-mmx -mno-sse
   ifeq ($(HOSTARCH),ia32)
     ARCH3264 = -m64