5263d48333
- Add upstream fixes - Remove the stderr mask while compiling MokManager.efi since the warnings in Cryptlib were fixed. OBS-URL: https://build.opensuse.org/request/show/518613 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=131
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From a120ddd83d02f302c72baa1974691a1f677829f3 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 8 Aug 2017 17:48:59 -0400
|
|
Subject: [PATCH] Fix openssl compile flags for x86_64
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
Cryptlib/Makefile | 2 +-
|
|
Cryptlib/OpenSSL/Makefile | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile
|
|
index 77a5bd4..e99f009 100644
|
|
--- a/Cryptlib/Makefile
|
|
+++ b/Cryptlib/Makefile
|
|
@@ -8,7 +8,7 @@ CFLAGS = -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-
|
|
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
|
|
+ -DMDE_CPU_X64
|
|
endif
|
|
ifeq ($(ARCH),ia32)
|
|
CFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args -m32 \
|
|
diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile
|
|
index 829fa5c..e54105b 100644
|
|
--- a/Cryptlib/OpenSSL/Makefile
|
|
+++ b/Cryptlib/OpenSSL/Makefile
|
|
@@ -8,7 +8,7 @@ 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 \
|
|
- -UNO_BUILTIN_VA_FUNCS -DMDE_CPU_IA64
|
|
+ -UNO_BUILTIN_VA_FUNCS -DMDE_CPU_X64
|
|
endif
|
|
ifeq ($(ARCH),ia32)
|
|
CFLAGS += -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \
|
|
--
|
|
2.14.0
|
|
|