Kaydet (Commit) e90788e6 authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Miklos Vajna

openssl: MSVC build: link and run MSASM with /SAFESEH

Actually the assembler requires lowercase /safeseh, oddly enough.

Change-Id: I1569409a2d6358282a7463ea996a6b1615e6ed8c
(cherry picked from commit 8f3ca083)
Reviewed-on: https://gerrit.libreoffice.org/47584Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst baf8708a
...@@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl ...@@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl
$(eval $(call gb_UnpackedTarball_add_patches,openssl,\ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
external/openssl/openssllnx.patch \ external/openssl/openssllnx.patch \
external/openssl/opensslwnt.patch \ external/openssl/opensslwnt.patch \
$(if $(filter INTEL,$(CPUNAME)),external/openssl/opensslwnt_safeseh.patch) \
external/openssl/openssl-1.0.1h-win64.patch.1 \ external/openssl/openssl-1.0.1h-win64.patch.1 \
external/openssl/opensslsol.patch \ external/openssl/opensslsol.patch \
external/openssl/opensslios.patch \ external/openssl/opensslios.patch \
......
use /safeseh in 32-bit MSVC builds; this is not required for 64-bit
diff -ru openssl.orig/util/mk1mf.pl openssl/util/mk1mf.pl
--- a/openssl.orig/util/mk1mf.pl 2016-03-03 20:22:21.043924505 +0100
+++ b/openssl/util/mk1mf.pl 2016-03-03 20:34:45.015901171 +0100
@@ -488,7 +493,7 @@
SRC_D=$src_dir
LINK_CMD=$link
-LFLAGS=$lflags
+LFLAGS=$lflags /SAFESEH
RSC=$rsc \$(SOLARINC)
# The output directory for everything interesting
@@ -511,7 +516,7 @@
MKDIR=$mkdir
MKLIB=$bin_dir$mklib
MLFLAGS=$mlflags
-ASM=$bin_dir$asm
+ASM=$bin_dir$asm /safeseh
# FIPS validated module and support file locations
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment