From b608c7f2b175e121f2c22d53341a317153afdc8e Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sat, 15 Apr 2000 06:18:51 +0000
Subject: OpenSSL 0.9.5a merge

---
 src/lib/libcrypto/perlasm/x86asm.pl  | 6 ++++--
 src/lib/libcrypto/perlasm/x86ms.pl   | 2 +-
 src/lib/libcrypto/perlasm/x86unix.pl | 8 ++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/perlasm')

diff --git a/src/lib/libcrypto/perlasm/x86asm.pl b/src/lib/libcrypto/perlasm/x86asm.pl
index 44e330eb8d..81c6e64e87 100644
--- a/src/lib/libcrypto/perlasm/x86asm.pl
+++ b/src/lib/libcrypto/perlasm/x86asm.pl
@@ -18,11 +18,13 @@ sub main'asm_init
 	($type,$fn,$i386)=@_;
 	$filename=$fn;
 
-	$cpp=$sol=$aout=$win32=0;
+	$cpp=$sol=$aout=$win32=$gaswin=0;
 	if (	($type eq "elf"))
 		{ require "x86unix.pl"; }
 	elsif (	($type eq "a.out"))
 		{ $aout=1; require "x86unix.pl"; }
+	elsif (	($type eq "gaswin"))
+		{ $gaswin=1; $aout=1; require "x86unix.pl"; }
 	elsif (	($type eq "sol"))
 		{ $sol=1; require "x86unix.pl"; }
 	elsif (	($type eq "cpp"))
@@ -50,7 +52,7 @@ EOF
 &comment("Don't even think of reading this code");
 &comment("It was automatically generated by $filename");
 &comment("Which is a perl program used to generate the x86 assember for");
-&comment("any of elf, a.out, BSDI,Win32, or Solaris");
+&comment("any of elf, a.out, BSDI, Win32, gaswin (for GNU as on Win32) or Solaris");
 &comment("eric <eay\@cryptsoft.com>");
 &comment("");
 
diff --git a/src/lib/libcrypto/perlasm/x86ms.pl b/src/lib/libcrypto/perlasm/x86ms.pl
index 252a57bdb5..206452341d 100644
--- a/src/lib/libcrypto/perlasm/x86ms.pl
+++ b/src/lib/libcrypto/perlasm/x86ms.pl
@@ -341,7 +341,7 @@ sub main'set_label
 		$label{$_[0]}="${label}${_[0]}";
 		$label++;
 		}
-	if((defined $_[1]) && ($_[1] == 1))
+	if((defined $_[2]) && ($_[2] == 1))
 		{
 		push(@out,"$label{$_[0]}::\n");
 		}
diff --git a/src/lib/libcrypto/perlasm/x86unix.pl b/src/lib/libcrypto/perlasm/x86unix.pl
index 60d75f5ce4..309060ea00 100644
--- a/src/lib/libcrypto/perlasm/x86unix.pl
+++ b/src/lib/libcrypto/perlasm/x86unix.pl
@@ -292,6 +292,8 @@ EOF
 	push(@out,$tmp);
 	if ($main'cpp)
 		{ $tmp=push(@out,"\tTYPE($func,\@function)\n"); }
+	elsif ($main'gaswin)
+		{ $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
 	else	{ $tmp=push(@out,"\t.type\t$func,\@function\n"); }
 	push(@out,"$func:\n");
 	$tmp=<<"EOF";
@@ -320,6 +322,8 @@ EOF
 	push(@out,$tmp);
 	if ($main'cpp)
 		{ push(@out,"\tTYPE($func,\@function)\n"); }
+	elsif ($main'gaswin)
+		{ $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
 	else	{ push(@out,"\t.type	$func,\@function\n"); }
 	push(@out,"$func:\n");
 	$stack=4;
@@ -342,6 +346,8 @@ EOF
 	push(@out,$tmp);
 	if ($main'cpp)
 		{ push(@out,"\tSIZE($func,.${func}_end-$func)\n"); }
+	elsif ($main'gaswin)
+                { $tmp=push(@out,"\t.align 4\n"); }
 	else	{ push(@out,"\t.size\t$func,.${func}_end-$func\n"); }
 	push(@out,".ident	\"$func\"\n");
 	$stack=0;
@@ -371,6 +377,8 @@ sub main'function_end_B
 	push(@out,".L_${func}_end:\n");
 	if ($main'cpp)
 		{ push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); }
+        elsif ($main'gaswin)
+                { push(@out,"\t.align 4\n"); }
 	else	{ push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); }
 	push(@out,".ident	\"desasm.pl\"\n");
 	$stack=0;
-- 
cgit v1.2.3-55-g6feb