diff options
Diffstat (limited to 'Cryptlib/Makefile')
| -rw-r--r-- | Cryptlib/Makefile | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile index a028979e..2aa56959 100644 --- a/Cryptlib/Makefile +++ b/Cryptlib/Makefile @@ -1,18 +1,20 @@ -EFI_INCLUDES = -IInclude -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol +EFI_INCLUDES = -I$(TOPDIR)/Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -CFLAGS = -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \ +CFLAGS = -ggdb -O0 -I$(TOPDIR) -iquote $(TOPDIR) -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \ -Wall $(EFI_INCLUDES) -std=gnu89 \ -ffreestanding -I$(shell $(CC) -print-file-name=include) +CLANG_BUGS = $(if $(findstring gcc,$(CC)),-maccumulate-outgoing-args,) + ifeq ($(ARCH),x86_64) - CFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args \ - -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DNO_BUILTIN_VA_FUNCS \ - -DMDE_CPU_IA64 + CFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc $(CLANG_BUGS) \ + -m64 -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI \ + -DNO_BUILTIN_VA_FUNCS -DMDE_CPU_X64 endif ifeq ($(ARCH),ia32) - CFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args -m32 \ - -DMDE_CPU_IA32 + CFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc \ + $(CLANG_BUGS) -m32 -DMDE_CPU_IA32 endif ifeq ($(ARCH),aarch64) CFLAGS += -DMDE_CPU_AARCH64 @@ -20,16 +22,17 @@ endif LDFLAGS = -nostdlib -znocombreloc TARGET = libcryptlib.a -OBJS = Hash/CryptMd4.o \ +OBJS = Hash/CryptMd4Null.o \ Hash/CryptMd5.o \ Hash/CryptSha1.o \ Hash/CryptSha256.o \ Hash/CryptSha512.o \ - Hmac/CryptHmacMd5.o \ - Hmac/CryptHmacSha1.o \ - Cipher/CryptAes.o \ - Cipher/CryptTdes.o \ - Cipher/CryptArc4.o \ + Hmac/CryptHmacMd5Null.o \ + Hmac/CryptHmacSha1Null.o \ + Hmac/CryptHmacSha256Null.o \ + Cipher/CryptAesNull.o \ + Cipher/CryptTdesNull.o \ + Cipher/CryptArc4Null.o \ Rand/CryptRand.o \ Pk/CryptRsaBasic.o \ Pk/CryptRsaExtNull.o \ @@ -39,11 +42,12 @@ OBJS = Hash/CryptMd4.o \ Pk/CryptTs.o \ Pk/CryptX509.o \ Pk/CryptAuthenticode.o \ - Pem/CryptPem.o \ + Pem/CryptPemNull.o \ SysCall/CrtWrapper.o \ SysCall/TimerWrapper.o \ SysCall/BaseMemAllocation.o \ - SysCall/BaseStrings.o + SysCall/BaseStrings.o \ + SysCall/memset.o all: $(TARGET) |