]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Configurations/10-main.conf: amend out-dated comments.
authorAndy Polyakov <appro@openssl.org>
Thu, 8 Mar 2018 20:11:12 +0000 (21:11 +0100)
committerAndy Polyakov <appro@openssl.org>
Fri, 9 Mar 2018 14:03:52 +0000 (15:03 +0100)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5502)

Configurations/10-main.conf

index 65f08b08acbcd9a497fa4a0f6035125ddf13a2c2..101d3fcad1469ff74b53f6a9315d6b665f5c81b6 100644 (file)
@@ -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"),