Build a debug image

diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile
index d8f999b3712e63c66c55835581d67b6afaba64be..925db8db62d86ceb2fe80b1de1af0e36810009f7 100644 (file)
--- a/Cryptlib/Makefile
+++ b/Cryptlib/Makefile
@@ -9,8 +9,8 @@ EFI_PATH        = /usr/lib64/gnuefi
 LIB_GCC                = $(shell $(CC) -print-libgcc-file-name)
 EFI_LIBS       = -lefi -lgnuefi $(LIB_GCC)
 
-CFLAGS         = -ggdb -O2 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \
-                 -Wall $(EFI_INCLUDES)
+CFLAGS         = -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \
+                 -Wall $(EFI_INCLUDES) -mno-red-zone
 ifeq ($(ARCH),x86_64)
        CFLAGS  += -DEFI_FUNCTION_WRAPPER
 endif

diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile
index 3597e87536aa311659a8b05e65b29cecb08f60d5..7fde3829e1a53e36b4d878bcbdb5d68230bb3418 100644 (file)
--- a/Cryptlib/OpenSSL/Makefile
+++ b/Cryptlib/OpenSSL/Makefile
@@ -9,8 +9,8 @@ EFI_PATH        = /usr/lib64/gnuefi
 LIB_GCC                = $(shell $(CC) -print-libgcc-file-name)
 EFI_LIBS       = -lefi -lgnuefi $(LIB_GCC)
 
-CFLAGS         = -ggdb -O2 -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 -DSIXTY_FOUR_BIT_LONG -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_SHA512 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_SMALL_FOOTPRINT -DPEDANTIC
+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 -DSIXTY_FOUR_BIT_LONG -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_SHA512 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_SMALL_FOOTPRINT -DPEDANTIC -mno-red-zone
 ifeq ($(ARCH),x86_64)
        CFLAGS  += -DEFI_FUNCTION_WRAPPER
 endif

diff --git a/Makefile b/Makefile
index 59968d14ec2b75c233b278be57036ca98d06c6bd..07a9cbe238694ed314c0c3eb209b85b5ab4a1123 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ EFI_CRT_OBJS  = $(EFI_PATH)/crt0-efi-$(ARCH).o
 EFI_LDS                = $(EFI_PATH)/elf_$(ARCH)_efi.lds
 
 
-CFLAGS         = -O2 -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \
-                 -Wall \
+CFLAGS         = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \
+                 -Wall -mno-red-zone \
                  $(EFI_INCLUDES)
 ifeq ($(ARCH),x86_64)
        CFLAGS  += -DEFI_FUNCTION_WRAPPER
@@ -43,8 +43,14 @@ Cryptlib/OpenSSL/libopenssl.a:
 %.efi: %.so
        objcopy -j .text -j .sdata -j .data \
                -j .dynamic -j .dynsym  -j .rel \
-               -j .rela -j .reloc \
+               -j .rela -j .reloc -j .eh_frame \
                --target=efi-app-$(ARCH) $^ $@
+       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) $^ shim.efi.debug
 
 clean:
        $(MAKE) -C Cryptlib clean