diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-03-08 21:11:12 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-03-09 15:03:52 +0100 |
| commit | c059564ab02122be574deb0f493be00a6b32b147 (patch) | |
| tree | 35210545b9f3100865bd66112a139b453ba9994f /Configurations/10-main.conf | |
| parent | b971b05ec6893fe7a3416a3b34d50a52b6cfe9bc (diff) | |
Configurations/10-main.conf: amend out-dated comments.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5502)
Diffstat (limited to 'Configurations/10-main.conf')
| -rw-r--r-- | Configurations/10-main.conf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 65f08b08ac..101d3fcad1 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", @@ -1460,8 +1462,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"), |