[arm] Use -fno-short-enums for all 32-bit ARM builds

The EFI ABI requires the use of -fno-short-enums, and the EDK2 headers
will perform a compile-time check that enums are 32 bits.

The EDK2 headers may be included even in builds for non-EFI platforms,
and so the -fno-short-enums flag must be used in all 32-bit ARM
builds.  Fortunately, nothing else currently cares about enum sizes.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/arm32/Makefile b/src/arch/arm32/Makefile
index 3a7c0923075dfe0fe8992fb43e2c875ee9c328fc..d32ab6a40a424f119468e8dea953db74ddd725df 100644 (file)
--- a/src/arch/arm32/Makefile
+++ b/src/arch/arm32/Makefile
@@ -13,6 +13,11 @@ ASFLAGS              += -mthumb -mcpu=cortex-a15
 #
 CFLAGS         += -fshort-wchar
 
+# EFI requires that enums are always 32 bits, and nothing else
+# currently cares
+#
+CFLAGS         += -fno-short-enums
+
 # Include common ARM Makefile
 MAKEDEPS       += arch/arm/Makefile
 include arch/arm/Makefile

diff --git a/src/arch/arm32/Makefile.efi b/src/arch/arm32/Makefile.efi
index e139a055a16c5b1a47437b059618f5849204a058..a06354f1d8fdd532d1085e79aa664369175accfa 100644 (file)
--- a/src/arch/arm32/Makefile.efi
+++ b/src/arch/arm32/Makefile.efi
@@ -1,9 +1,5 @@
 # -*- makefile -*- : Force emacs to use Makefile mode
 
-# UEFI requires that enums are always 32 bits
-#
-CFLAGS         += -fno-short-enums
-
 # Specify EFI image builder
 #
 ELF2EFI                = $(ELF2EFI32)