From: Andy Polyakov <appro@openssl.org>
Date: Tue, 31 May 2005 11:07:27 +0000 (+0000)
Subject: Platform update from 8-stable.
X-Git-Tag: OpenSSL_0_9_8k^2~2071
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f8bc3e1bd842752edfe5d6fb9449a223167124e9;p=oweals%2Fopenssl.git

Platform update from 8-stable.
---

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
 ___
 }