diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-03-18 23:31:17 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-03-21 11:27:57 +0100 |
| commit | acf1525966161dc5d0f875d92ae3def5df628245 (patch) | |
| tree | 2a044aae87eebddd8d226755904b550036fee06e /ms | |
| parent | d8292af423bffad00610ebe02d7a8868c7f95dfd (diff) | |
Windows build system: get uplink right.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ms')
| -rwxr-xr-x | ms/uplink-ia64.pl | 5 | ||||
| -rwxr-xr-x | ms/uplink-x86_64.pl | 2 | ||||
| -rw-r--r-- | ms/uplink.c | 28 |
3 files changed, 6 insertions, 29 deletions
diff --git a/ms/uplink-ia64.pl b/ms/uplink-ia64.pl index 4204c73d58..089cd3913f 100755 --- a/ms/uplink-ia64.pl +++ b/ms/uplink-ia64.pl @@ -1,5 +1,8 @@ #!/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; diff --git a/ms/uplink-x86_64.pl b/ms/uplink-x86_64.pl index 48bf559ee1..0cb0f1b300 100755 --- a/ms/uplink-x86_64.pl +++ b/ms/uplink-x86_64.pl @@ -1,6 +1,6 @@ #!/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; diff --git a/ms/uplink.c b/ms/uplink.c index e58ab9d8f5..4f480a7981 100644 --- a/ms/uplink.c +++ b/ms/uplink.c @@ -90,34 +90,6 @@ void OPENSSL_Uplink(volatile void **table, int index) table[index] = func; } -#if defined(_MSC_VER) && defined(_M_IX86) && !defined(OPENSSL_NO_INLINE_ASM) -# define LAZY(i) \ -__declspec(naked) static void lazy##i (void) { \ - _asm push i \ - _asm push OFFSET OPENSSL_UplinkTable \ - _asm call OPENSSL_Uplink \ - _asm add esp,8 \ - _asm jmp OPENSSL_UplinkTable+4*i } - -# if APPLINK_MAX>25 -# error "Add more stubs..." -# endif -/* make some in advance... */ -LAZY(1) LAZY(2) LAZY(3) LAZY(4) LAZY(5) - LAZY(6) LAZY(7) LAZY(8) LAZY(9) LAZY(10) - LAZY(11) LAZY(12) LAZY(13) LAZY(14) LAZY(15) - LAZY(16) LAZY(17) LAZY(18) LAZY(19) LAZY(20) - LAZY(21) LAZY(22) LAZY(23) LAZY(24) LAZY(25) -void *OPENSSL_UplinkTable[] = { - (void *)APPLINK_MAX, - lazy1, lazy2, lazy3, lazy4, lazy5, - lazy6, lazy7, lazy8, lazy9, lazy10, - lazy11, lazy12, lazy13, lazy14, lazy15, - lazy16, lazy17, lazy18, lazy19, lazy20, - lazy21, lazy22, lazy23, lazy24, lazy25, -}; -#endif - #ifdef SELFTEST main() { |