summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2005-05-31 11:07:27 +0000
committerAndy Polyakov <appro@openssl.org>2005-05-31 11:07:27 +0000
commitf8bc3e1bd842752edfe5d6fb9449a223167124e9 (patch)
treef9a4522d3803f65f3fc4ae97dd71e91b7a18aded
parent5b737a0731f809319550be7fb856a7194950db90 (diff)
Platform update from 8-stable.
-rw-r--r--crypto/perlasm/x86unix.pl4
-rwxr-xr-xms/uplink.pl12
2 files changed, 8 insertions, 8 deletions
diff --git a/crypto/perlasm/x86unix.pl b/crypto/perlasm/x86unix.pl
index 18d4fbff45..9bc5c0e893 100644
--- a/crypto/perlasm/x86unix.pl
+++ b/crypto/perlasm/x86unix.pl
@@ -719,9 +719,9 @@ sub main'initseg
$tmp=<<___;
.section .init
call $under$f
- jmp 1f
+ jmp .Linitalign
.align $align
-1:
+.Linitalign:
___
}
elsif ($main'coff)
diff --git a/ms/uplink.pl b/ms/uplink.pl
index 5dacc4f1a1..102400e880 100755
--- a/ms/uplink.pl
+++ b/ms/uplink.pl
@@ -168,23 +168,23 @@ _DATA SEGMENT
PUBLIC OPENSSL_UplinkTable
OPENSSL_UplinkTable DQ $N
___
-for ($i=1;$i<=$N;$i++) { print " DQ FLAT:\$lazy$i\n"; }
+for ($i=1;$i<=$N;$i++) { print " DQ \$lazy$i\n"; }
print <<___;
_DATA ENDS
-TEXT SEGMENT
-EXTERN OPENSSL_Uplink:NEAR
+_TEXT SEGMENT
+EXTERN OPENSSL_Uplink:PROC
___
for ($i=1;$i<=$N;$i++) {
print <<___;
ALIGN 4
-\$lazy$i PROC NEAR
+\$lazy$i PROC
push r9
push r8
push rdx
push rcx
sub rsp,40
- mov rcx,OFFSET FLAT:OPENSSL_UplinkTable
+ lea rcx,OFFSET OPENSSL_UplinkTable
mov rdx,$i
call OPENSSL_Uplink
add rsp,40
@@ -197,7 +197,7 @@ ALIGN 4
___
}
print <<___;
-TEXT ENDS
+_TEXT ENDS
END
___
}