diff options
| author | Gary Ching-Pang Lin <glin@suse.com> | 2015-11-09 09:50:50 -0500 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2015-11-09 09:50:50 -0500 |
| commit | 775fdb9f4f954b01876419d0219a8acdfa455fc7 (patch) | |
| tree | c52c4a6cfde6d31ae5c345183fb3c3ee0ecf33f9 /Cryptlib/OpenSSL/Makefile | |
| parent | 11a4d912bd720a244dbd75a4987b3edcd6a6eb4b (diff) | |
| download | efi-boot-shim-775fdb9f4f954b01876419d0219a8acdfa455fc7.tar.gz efi-boot-shim-775fdb9f4f954b01876419d0219a8acdfa455fc7.zip | |
Cryptlib: Define the va functions for EFIAPI
It turned out that my previous crash fix(*) was wrong.
We actually always used the gcc built-in va functions instead of
the "real" va functions for EFIAPI, and we are just lucky that
ERR_add_error_data didn't crash before.
This commit copies the va functions from MdePkg/Include/Base.h
in edk2 and introdues NO_BUILTIN_VA_FUNCS for x86_64, so that all
the x86_64 build will adopt the new va functions. For safety,
I also added EFIAPI to all the functions which use va_* to avoid
the potential trouble.
(*) a7f4b26cc35204165bd04e75c34e8e7aa2a87ecc
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
Diffstat (limited to 'Cryptlib/OpenSSL/Makefile')
| -rw-r--r-- | Cryptlib/OpenSSL/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile index ab6e7ddf..f8055fd3 100644 --- a/Cryptlib/OpenSSL/Makefile +++ b/Cryptlib/OpenSSL/Makefile @@ -7,7 +7,8 @@ CFLAGS = -ggdb -O0 -I. -I.. -I../Include/ -Icrypto -fno-stack-protector -fno-st ifeq ($(ARCH),x86_64) CFLAGS += -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \ - -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DSIXTY_FOUR_BIT_LONG + -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DSIXTY_FOUR_BIT_LONG \ + -DNO_BUILTIN_VA_FUNCS endif ifeq ($(ARCH),ia32) CFLAGS += -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \ |