[openssl-commits] [openssl] master update
Andy Polyakov
appro at openssl.org
Fri Mar 9 14:05:08 UTC 2018
The branch master has been updated
via 5936e8884bc6f3b9ff9abf8ebbeb772809882f92 (commit)
via 6a145a32f2cc6c19263a3c02281ced074da03c8e (commit)
via c059564ab02122be574deb0f493be00a6b32b147 (commit)
from b971b05ec6893fe7a3416a3b34d50a52b6cfe9bc (commit)
- Log -----------------------------------------------------------------
commit 5936e8884bc6f3b9ff9abf8ebbeb772809882f92
Author: Andy Polyakov <appro at openssl.org>
Date: Sat Mar 3 23:09:52 2018 +0100
Configurations/50-win-onecore.conf: add Windows 10 OneCore targets.
This includes even ARM targets.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5502)
commit 6a145a32f2cc6c19263a3c02281ced074da03c8e
Author: Andy Polyakov <appro at openssl.org>
Date: Sat Mar 3 22:26:45 2018 +0100
Configurations/windows-makefile.tmpl: simplify install-path "flavour"-ing.
$target{build_scheme} consists of fixed number of elements with 3rd
element denoting VC install-path "flavour", i.e. where to install things.
Instead of looking at 3rd, let's look at last. This allows to override
flavour from template in a simple way.
Configurations/10-main.conf: define generic "flavour" in VC-common
template. Since VC-W32 was the only recognized "flavour", remove
"flavour" definitions from all targets/templates, but VC-WIN32. And
rename VC-W32 to VC-WOW.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5502)
commit c059564ab02122be574deb0f493be00a6b32b147
Author: Andy Polyakov <appro at openssl.org>
Date: Thu Mar 8 21:11:12 2018 +0100
Configurations/10-main.conf: amend out-dated comments.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5502)
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 16 +++++++----
Configurations/50-win-onecore.conf | 56 ++++++++++++++++++++++++++++++++++++
Configurations/windows-makefile.tmpl | 16 +++++------
3 files changed, 75 insertions(+), 13 deletions(-)
create mode 100644 Configurations/50-win-onecore.conf
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 65f08b0..6b57549 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -11,6 +11,7 @@ sub vc_win64a_info {
asflags => "-Ox -f win64 -DNEAR",
asoutflag => "-o " };
} elsif ($disabled{asm}) {
+ # assembler is still used to compile uplink shim
$vc_win64a_info = { AS => "ml64",
ASFLAGS => "/Zi",
asflags => "/c /Cp /Cx",
@@ -38,6 +39,7 @@ sub vc_win32_info {
asoutflag => "-o ",
perlasm_scheme => "win32n" };
} elsif ($disabled{asm}) {
+ # not actually used, uplink shim is inlined into C code
$vc_win32_info = { AS => "ml",
ASFLAGS => "/nologo /Zi",
asflags => "/Cp /coff /c /Cx",
@@ -1384,6 +1386,8 @@ my %targets = (
thread_scheme => "winthreads",
dso_scheme => "win32",
apps_aux_src => add("win32_init.c"),
+ # additional parameter to build_scheme denotes install-path "flavour"
+ build_scheme => add("VC-common", { separator => undef }),
},
"VC-noCE-common" => {
inherit_from => [ "VC-common" ],
@@ -1432,7 +1436,6 @@ my %targets = (
return join(" ", @_, @ex_libs);
}),
bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
- build_scheme => add("VC-W64", { separator => undef }),
},
"VC-WIN64I" => {
inherit_from => [ "VC-WIN64-common", asm("ia64_asm"),
@@ -1460,8 +1463,10 @@ my %targets = (
multilib => "-x64",
},
"VC-WIN32" => {
- # x86 Win32 target defaults to ANSI API, if you want UNICODE,
- # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE'
+ # x86 Win32 target used to default to ANSI API, but not anymore,
+ # UNICODE is the only option. The original reason for providing
+ # UNICODE as opt-in option was because ANSI API was *native*
+ # system interface for [no longer supported] Windows 9x.
inherit_from => [ "VC-noCE-common", asm("x86_asm"),
sub { $disabled{shared} ? () : "uplink_common" } ],
CFLAGS => add("-WX"),
@@ -1480,7 +1485,9 @@ my %targets = (
sys_id => "WIN32",
bn_ops => "BN_LLONG EXPORT_VAR_AS_FN",
perlasm_scheme => sub { vc_win32_info()->{perlasm_scheme} },
- build_scheme => add("VC-W32", { separator => undef }),
+ # "WOW" stands for "Windows on Windows", and "VC-WOW" engages
+ # some installation path heuristics in windows-makefile.tmpl...
+ build_scheme => add("VC-WOW", { separator => undef }),
},
"VC-CE" => {
inherit_from => [ "VC-common" ],
@@ -1535,7 +1542,6 @@ my %targets = (
if (env('TARGETCPU') eq "X86");
return @ex_libs;
}),
- build_scheme => add("VC-WCE", { separator => undef }),
},
#### MinGW
diff --git a/Configurations/50-win-onecore.conf b/Configurations/50-win-onecore.conf
new file mode 100644
index 0000000..1207621
--- /dev/null
+++ b/Configurations/50-win-onecore.conf
@@ -0,0 +1,56 @@
+# Windows OneCore targets.
+#
+# OneCore is new API stability "contract" that transends Desktop, IoT and
+# Mobile[?] Windows editions. It's a set up "umbrella" libraries that
+# export subset of Win32 API that are common to all Windows 10 devices.
+#
+# TODO: drop onecore_downlevel.lib.
+
+my %targets = (
+ "VC-WIN32-ONECORE" => {
+ inherit_from => [ "VC-WIN32" ],
+ # /NODEFAULTLIB:kernel32.lib is needed, because MSVCRT.LIB has
+ # hidden reference to kernel32.lib, but we don't actually want
+ # it in "onecore" build.
+ lflags => add("/NODEFAULTLIB:kernel32.lib"),
+ ex_libs => "onecore.lib onecore_downlevel.lib",
+ },
+ "VC-WIN64A-ONECORE" => {
+ inherit_from => [ "VC-WIN64A" ],
+ lflags => add("/NODEFAULTLIB:kernel32.lib"),
+ ex_libs => "onecore.lib onecore_downlevel.lib",
+ },
+
+ # Windows on ARM targets. ARM compilers are additional components in
+ # VS2017, i.e. they are not installed by default. And when installed,
+ # there are no "ARM Tool Command Prompt"s on Start menu, you have
+ # to locate vcvarsall.bat and act accordingly. VC-WIN32-ARM has
+ # received limited testing with evp_test.exe on Windows 10 IoT Core,
+ # but not VC-WIN64-ARM, no hardware... In other words they are not
+ # actually supported...
+ #
+ # Another thing to keep in mind [in cross-compilation scenario such
+ # as this one] is that target's file system has nothing to do with
+ # compilation system's one. This means that you're are likely to use
+ # --prefix and --openssldir with target-specific values. 'nmake install'
+ # step is effectively meaningless in cross-compilation case, though
+ # it might be useful to 'nmake install DESTDIR=S:\ome\where' where you
+ # can point Visual Studio to when compiling custom application code.
+
+ "VC-WIN32-ARM" => {
+ inherit_from => [ "VC-noCE-common" ],
+ defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE"),
+ bn_ops => "BN_LLONG RC4_CHAR EXPORT_VAR_AS_FN",
+ lflags => add("/NODEFAULTLIB:kernel32.lib"),
+ ex_libs => "onecore.lib onecore_downlevel.lib",
+ multilib => "-arm",
+ },
+ "VC-WIN64-ARM" => {
+ inherit_from => [ "VC-noCE-common" ],
+ defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE"),
+ bn_ops => "SIXTY_FOUR_BIT RC4_CHAR EXPORT_VAR_AS_FN",
+ lflags => add("/NODEFAULTLIB:kernel32.lib"),
+ ex_libs => "onecore.lib onecore_downlevel.lib",
+ multilib => "-arm64",
+ },
+);
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 214619a..662ec46 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -14,18 +14,18 @@
(our $sover_dirname = $config{shlib_version_number}) =~ s|\.|_|g;
+ my $build_scheme = $target{build_scheme};
+ my $install_flavour = $build_scheme->[$#$build_scheme]; # last element
my $win_installenv =
- $target{build_scheme}->[2] eq "VC-W32" ?
- "ProgramFiles(x86)" : "ProgramW6432";
+ $install_flavour eq "VC-WOW" ? "ProgramFiles(x86)"
+ : "ProgramW6432";
my $win_commonenv =
- $target{build_scheme}->[2] eq "VC-W32"
- ? "CommonProgramFiles(x86)" : "CommonProgramW6432";
+ $install_flavour eq "VC-WOW" ? "CommonProgramFiles(x86)"
+ : "CommonProgramW6432";
our $win_installroot =
- defined($ENV{$win_installenv})
- ? $win_installenv : 'ProgramFiles';
+ defined($ENV{$win_installenv}) ? $win_installenv : 'ProgramFiles';
our $win_commonroot =
- defined($ENV{$win_commonenv})
- ? $win_commonenv : 'CommonProgramFiles';
+ defined($ENV{$win_commonenv}) ? $win_commonenv : 'CommonProgramFiles';
# expand variables early
$win_installroot = $ENV{$win_installroot};
More information about the openssl-commits
mailing list