Commit acf15259 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Windows build system: get uplink right. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent d8292af4

Configurations/00-base-templates.conf

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ 
	template	=> 1,

	apps_aux_src	=> add("../ms/applink.c"),

	uplink_aux_src	=> add("../ms/uplink.c"),

	shared_defines	=> add("OPENSSL_USE_APPLINK", { separator => undef }),

	defines		=> add("OPENSSL_USE_APPLINK"),

    },

    x86_uplink => {

	inherit_from	=> [ "uplink_common" ],

Configurations/10-main.conf

+7 −4
Original line number Diff line number Diff line
@@ -1237,7 +1237,7 @@ sub vc_wince_info { 
        dso_scheme       => "win32",

    },

    "VC-noCE-common" => {

        inherit_from     => [ "VC-common", "uplink_common" ],

        inherit_from     => [ "VC-common" ],

        cflags           => add(picker(default => "-DUNICODE -D_UNICODE",

                                       debug   =>

                                       sub {
@@ -1268,7 +1268,8 @@ sub vc_wince_info { 
        build_scheme     => add("VC-W64", { separator => undef }),

    },

    "VC-WIN64I" => {

        inherit_from     => [ "VC-WIN64-common", asm("ia64_asm") ],

        inherit_from     => [ "VC-WIN64-common", asm("ia64_asm"),

                              sub { $disabled{shared} ? () : "ia64_uplink" } ],

        as               => "ias",

        asflags          => "-d debug",

        asoutflag        => "-o",
@@ -1277,7 +1278,8 @@ sub vc_wince_info { 
        perlasm_scheme   => "ias",

    },

    "VC-WIN64A" => {

        inherit_from     => [ "VC-WIN64-common", asm("x86_64_asm") ],

        inherit_from     => [ "VC-WIN64-common", asm("x86_64_asm"),

                              sub { $disabled{shared} ? () : "x86_64_uplink" } ],

        as               => sub { vc_win64a_info()->{as} },

        asflags          => sub { vc_win64a_info()->{asflags} },

        asoutflag        => sub { vc_win64a_info()->{asoutflag} },
@@ -1289,7 +1291,8 @@ sub vc_wince_info { 
    "VC-WIN32" => {

        # x86 Win32 target defaults to ANSI API, if you want UNICODE,

        # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE'

        inherit_from     => [ "VC-noCE-common", asm("x86_asm") ],

        inherit_from     => [ "VC-noCE-common", asm("x86_asm"),

                              sub { $disabled{shared} ? () : "x86_uplink" } ],

        as               => sub { my $ver=`nasm -v 2>NUL`;

                                  my $vew=`nasmw -v 2>NUL`;

                                  return $ver ge $vew ? "nasm" : "nasmw" },

crypto/build.info

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CFLAGS_Q)" "$(PLATFORM)" 
DEPEND[buildinf.h]=../configdata.pm



GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)

GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl $(PERLASM_SCHEME)

GENERATE[uplink-ia64.s]=../ms/uplink-ia64.pl $(PERLASM_SCHEME)



GENERATE[x86cpuid.s]=x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)

DEPEND[x86cpuid.s]=perlasm/x86asm.pl

ms/uplink-ia64.pl

+5 −0
Original line number Diff line number Diff line 
#!/usr/bin/env perl



$output = pop;

open STDOUT,">$output";



$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;

push(@INC,"${dir}.");
@@ -48,3 +51,5 @@ for ($i=1;$i<=$N;$i++) { print " data8 \@fptr(lazy$i#)\n"; } 
print <<___;

.size   OPENSSL_UplinkTable,.-OPENSSL_UplinkTable#

___



close STDOUT;

ms/uplink-x86_64.pl

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/env perl



$output=shift;

$output=pop;

$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;

open OUT,"| \"$^X\" ${dir}../crypto/perlasm/x86_64-xlate.pl $output";

*STDOUT=*OUT;