From 99d7b5e858945b8bb160fe3fea77596b2daf07ff Mon Sep 17 00:00:00 2001

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

Date: Tue, 12 Aug 2014 15:33:20 +0200

Subject: [PATCH 47/74] Factor out x86-isms and add cross compile support

This patch cleans up and refactors the Makefiles to better allow new

architectures to be added:

- remove unused Makefile definitions

- import Makefile definitions from top level rather than redefining

- move x86 specific CFLAGS to inside ifeq() blocks

- remove x86 inline asm

- allow $(FORMAT) to be overridden: this is necessary as there exists no

  EFI or PE/COFF aware objcopy for ARM

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---

 Cryptlib/Makefile         | 16 ++++++----------

 Cryptlib/OpenSSL/Makefile | 15 ++++++---------

 Makefile                  | 45 +++++++++++++++++++++++++++------------------

 lib/Makefile              | 14 ++++----------

 netboot.c                 | 10 +---------

 5 files changed, 44 insertions(+), 56 deletions(-)

diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile

index 678baac..73a1e2b 100644

--- a/Cryptlib/Makefile

+++ b/Cryptlib/Makefile

@@ -1,19 +1,15 @@

-ARCH		= $(shell uname -m | sed s,i[3456789]86,ia32,)

-EFI_INCLUDE	= /usr/include/efi

-EFI_INCLUDES	= -nostdinc -IInclude -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol

-EFI_PATH	= /usr/lib64/gnuefi

-

-LIB_GCC		= $(shell $(CC) -print-libgcc-file-name)

-EFI_LIBS	= -lefi -lgnuefi $(LIB_GCC)

+EFI_INCLUDES	= -IInclude -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol

 CFLAGS		= -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \

-		  -Wall $(EFI_INCLUDES) -mno-red-zone -maccumulate-outgoing-args -mno-sse -mno-mmx

+		  -Wall $(EFI_INCLUDES)

+

 ifeq ($(ARCH),x86_64)

-	CFLAGS	+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI

+	CFLAGS	+= -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args \

+		-DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI

 endif

 ifeq ($(ARCH),ia32)

-	CFLAGS	+= -m32

+	CFLAGS	+= -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args -m32

 endif

 LDFLAGS		= -nostdlib -znocombreloc

diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile

index 8e2f2a6..9097580 100644

--- a/Cryptlib/OpenSSL/Makefile

+++ b/Cryptlib/OpenSSL/Makefile

@@ -1,19 +1,16 @@

-ARCH		= $(shell uname -m | sed s,i[3456789]86,ia32,)

-EFI_INCLUDE	= /usr/include/efi

 EFI_INCLUDES	= -I../Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol

-EFI_PATH	= /usr/lib64/gnuefi

-LIB_GCC		= $(shell $(CC) -print-libgcc-file-name)

-EFI_LIBS	= -lefi -lgnuefi $(LIB_GCC)

-

-CFLAGS		= -ggdb -O0 -I. -I.. -I../Include/ -Icrypto -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar -nostdinc -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \

+CFLAGS		= -ggdb -O0 -I. -I.. -I../Include/ -Icrypto -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar -nostdinc \

 		  -Wall $(EFI_INCLUDES) -DOPENSSL_SYSNAME_UWIN -DOPENSSL_SYS_UEFI -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_SOCK -DOPENSSL_NO_CMS -DOPENSSL_NO_JPAKE -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_ERR -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DGETPID_IS_MEANINGLESS -DOPENSSL_NO_STDIO -DOPENSSL_NO_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_SHA0 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_SMALL_FOOTPRINT -DPEDANTIC

+

 ifeq ($(ARCH),x86_64)

-	CFLAGS	+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DSIXTY_FOUR_BIT_LONG

+	CFLAGS	+= -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \

+		-DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DSIXTY_FOUR_BIT_LONG

 endif

 ifeq ($(ARCH),ia32)

-	CFLAGS	+= -m32 -DTHIRTY_TWO_BIT

+	CFLAGS	+= -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \

+		-m32 -DTHIRTY_TWO_BIT

 endif

 LDFLAGS		= -nostdlib -znocombreloc

diff --git a/Makefile b/Makefile

index df190a2..f65bb3b 100644

--- a/Makefile

+++ b/Makefile

@@ -1,10 +1,14 @@

-ARCH		= $(shell uname -m | sed s,i[3456789]86,ia32,)

+CC		= $(CROSS_COMPILE)gcc

+LD		= $(CROSS_COMPILE)ld

+OBJCOPY		= $(CROSS_COMPILE)objcopy

+

+ARCH		= $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)

 SUBDIRS		= Cryptlib lib

 LIB_PATH	= /usr/lib64

-EFI_INCLUDE	= /usr/include/efi

+EFI_INCLUDE	:= /usr/include/efi

 EFI_INCLUDES	= -nostdinc -ICryptlib -ICryptlib/Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -Iinclude

 EFI_PATH	:= /usr/lib64/gnuefi

@@ -16,9 +20,7 @@ EFI_LDS		= elf_$(ARCH)_efi.lds

 DEFAULT_LOADER	:= \\\\grub.efi

 CFLAGS		= -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \

-		  -fshort-wchar -Wall -Wsign-compare -Werror \

-		  -mno-red-zone -maccumulate-outgoing-args \

-		  -mno-mmx -mno-sse -fno-builtin \

+		  -fshort-wchar -Wall -Wsign-compare -Werror -fno-builtin \

 		  "-DDEFAULT_LOADER=L\"$(DEFAULT_LOADER)\"" \

 		  "-DDEFAULT_LOADER_CHAR=\"$(DEFAULT_LOADER)\"" \

 		  $(EFI_INCLUDES)

@@ -26,12 +28,15 @@ CFLAGS		= -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \

 ifneq ($(origin OVERRIDE_SECURITY_POLICY), undefined)

 	CFLAGS	+= -DOVERRIDE_SECURITY_POLICY

 endif

+

 ifeq ($(ARCH),x86_64)

-	CFLAGS	+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI

+	CFLAGS	+= -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args \

+		-DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI

 endif

 ifeq ($(ARCH),ia32)

-	CFLAGS	+= -m32

+	CFLAGS	+= -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args -m32

 endif

+

 ifneq ($(origin VENDOR_CERT_FILE), undefined)

 	CFLAGS += -DVENDOR_CERT_FILE=\"$(VENDOR_CERT_FILE)\"

 endif

@@ -95,26 +100,28 @@ MokManager.so: $(MOK_OBJS) Cryptlib/libcryptlib.a Cryptlib/OpenSSL/libopenssl.a

 	$(LD) -o $@ $(LDFLAGS) $^ $(EFI_LIBS) lib/lib.a

 Cryptlib/libcryptlib.a:

-	$(MAKE) -C Cryptlib EFI_PATH=$(EFI_PATH) EFI_INCLUDE=$(EFI_INCLUDE) ARCH=$(ARCH)

+	$(MAKE) -C Cryptlib

 Cryptlib/OpenSSL/libopenssl.a:

-	$(MAKE) -C Cryptlib/OpenSSL EFI_PATH=$(EFI_PATH) EFI_INCLUDE=$(EFI_INCLUDE) ARCH=$(ARCH) 

+	$(MAKE) -C Cryptlib/OpenSSL

 lib/lib.a:

-	$(MAKE) -C lib EFI_PATH=$(EFI_PATH) EFI_INCLUDE=$(EFI_INCLUDE) ARCH=$(ARCH)

+	$(MAKE) -C lib

+

+FORMAT		?= --target efi-app-$(ARCH)

 %.efi: %.so

-	objcopy -j .text -j .sdata -j .data \

-		-j .dynamic -j .dynsym  -j .rel \

-		-j .rela -j .reloc -j .eh_frame \

+	$(OBJCOPY) -j .text -j .sdata -j .data \

+		-j .dynamic -j .dynsym  -j .rel* \

+		-j .rela* -j .reloc -j .eh_frame \

 		-j .vendor_cert \

-		--target=efi-app-$(ARCH) $^ $@

-	objcopy -j .text -j .sdata -j .data \

-		-j .dynamic -j .dynsym  -j .rel \

-		-j .rela -j .reloc -j .eh_frame \

+		$(FORMAT)  $^ $@

+	$(OBJCOPY) -j .text -j .sdata -j .data \

+		-j .dynamic -j .dynsym  -j .rel* \

+		-j .rela* -j .reloc -j .eh_frame \

 		-j .debug_info -j .debug_abbrev -j .debug_aranges \

 		-j .debug_line -j .debug_str -j .debug_ranges \

-		--target=efi-app-$(ARCH) $^ $@.debug

+		$(FORMAT) $^ $@.debug

 %.efi.signed: %.efi certdb/secmod.db

 	pesign -n certdb -i $< -c "shim" -s -o $@ -f

@@ -151,3 +158,5 @@ archive: tag

 	@dir=$$PWD; cd /tmp; tar -c --bzip2 -f $$dir/shim-$(VERSION).tar.bz2 shim-$(VERSION)

 	@rm -rf /tmp/shim-$(VERSION)

 	@echo "The archive is in shim-$(VERSION).tar.bz2"

+

+export ARCH CC LD OBJCOPY EFI_INCLUDE

diff --git a/lib/Makefile b/lib/Makefile

index a9c9cf6..ebd21a1 100644

--- a/lib/Makefile

+++ b/lib/Makefile

@@ -2,23 +2,17 @@ TARGET = lib.a

 LIBFILES = simple_file.o guid.o console.o execute.o configtable.o shell.o variables.o security_policy.o

-ARCH            = $(shell uname -m | sed s,i[3456789]86,ia32,)

-

-EFI_INCLUDE     = /usr/include/efi

 EFI_INCLUDES    = -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I../include

-EFI_CRT_OBJS    = $(EFI_PATH)/crt0-efi-$(ARCH).o

-EFI_LDS         = $(EFI_PATH)/elf_$(ARCH)_efi.lds

-

 CFLAGS          = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \

-		  -fshort-wchar -Wall -mno-red-zone -DBUILD_EFI -fno-builtin \

-		  -Werror \

+		  -fshort-wchar -Wall -DBUILD_EFI -fno-builtin -Werror \

 		  $(EFI_INCLUDES)

+

 ifeq ($(ARCH),x86_64)

-        CFLAGS  += -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI

+        CFLAGS  += -mno-red-zone -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI

 endif

 ifeq ($(ARCH),ia32)

-        CFLAGS  += -m32

+        CFLAGS  += -mno-red-zone -m32

 endif

 lib.a: $(LIBFILES)

diff --git a/netboot.c b/netboot.c

index 5ef53f7..238937d 100644

--- a/netboot.c

+++ b/netboot.c

@@ -40,15 +40,7 @@

 #include "netboot.h"

 #include "str.h"

-static inline unsigned short int __swap16(unsigned short int x)

-{

-        __asm__("xchgb %b0,%h0"

-                : "=q" (x)

-                : "0" (x));

-	return x;

-}

-

-#define ntohs(x) __swap16(x)

+#define ntohs(x) __builtin_bswap16(x)	/* supported both by GCC and clang */

 #define htons(x) ntohs(x)

 static EFI_PXE_BASE_CODE *pxe;

-- 

1.9.3