From 031e5cce385d3f96b1caa1d53495332a7eb03749 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Tue, 23 Mar 2021 23:49:46 +0000
Subject: New upstream version 15.3

---
 lib/Makefile | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

(limited to 'lib/Makefile')

diff --git a/lib/Makefile b/lib/Makefile
index db5ff711..6d83f789 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,9 +1,45 @@
 TARGET = lib.a
 
-LIBFILES = simple_file.o guid.o console.o execute.o configtable.o shell.o variables.o security_policy.o
+LIBFILES_UNSORTED := $(foreach x,$(wildcard *.c),$(patsubst %.c,%.o,$(x)))
+LIBFILES := $(sort $(LIBFILES_UNSORTED))
 
-EFI_INCLUDES    = -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I$(TOPDIR)/../include \
-		  -I$(TOPDIR)/CryptLib/Include/openssl/
+CRYPTDIR	= $(TOPDIR)/Cryptlib
+
+INCLUDES	= $(EFI_INCLUDES) \
+		  -I$(TOPDIR)/include \
+		  -I$(CRYPTDIR)/Include/openssl/ \
+		  -I$(CRYPTDIR)/Include/ \
+		  -I$(CRYPTDIR) \
+		  -I$(TOPDIR) \
+		  -isystem $(TOPDIR)/include/system \
+		  -isystem $(shell $(CC) -print-file-name=include)
+
+CLANG_BUGS	= $(if $(findstring gcc,$(CC)),-maccumulate-outgoing-args,)
+
+ifeq ($(ARCH),x86_64)
+FEATUREFLAGS	+= -m64 -mno-mmx -mno-sse -mno-red-zone -nostdinc $(CLANG_BUGS)
+DEFINES		+= -DMDE_CPU_X64
+endif
+ifeq ($(ARCH),ia32)
+FEATUREFLAGS	+= -m32 -mno-mmx -mno-sse -mno-red-zone -nostdinc $(CLANG_BUGS)
+DEFINES		+= -DMDE_CPU_IA32
+endif
+ifeq ($(ARCH),aarch64)
+DEFINES		+= -DMDE_CPU_AARCH64
+endif
+ifeq ($(ARCH),arm)
+DEFINES		+= -DMDE_CPU_ARM
+endif
+
+LDFLAGS		= -nostdlib -znocombreloc
+
+
+CFLAGS		= $(FEATUREFLAGS) \
+		  $(OPTIMIZATIONS) \
+		  $(WARNFLAGS) \
+		  $(WERRFLAGS) \
+		  $(INCLUDES) \
+		  $(DEFINES)
 
 lib.a: $(LIBFILES)
 	$(AR) rcs lib.a $(LIBFILES)
-- 
cgit v1.2.3