New option to generate 80386 code.

7 files changed, 8 insertions, 14 deletions

diff --git a/crypto/bf/Makefile.ssl b/crypto/bf/Makefile.ssl
index cc4e3586df..2f92edaafb 100644
--- a/crypto/bf/Makefile.ssl
+++ b/crypto/bf/Makefile.ssl
@@ -64,7 +64,7 @@ asm/bx86bsdi.o: asm/bx86unix.cpp
 	$(CPP) -DBSDI asm/bx86unix.cpp | sed 's/ :/:/' | as -o asm/bx86bsdi.o
 
 asm/bx86unix.cpp:
-	(cd asm; perl bf-586.pl cpp >bx86unix.cpp)
+	(cd asm; perl bf-586.pl cpp $(PROCESSOR) >bx86unix.cpp)
 
 files:
 	perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
diff --git a/crypto/bf/asm/bf-586.pl b/crypto/bf/asm/bf-586.pl
index 252abb710d..b556642c94 100644
--- a/crypto/bf/asm/bf-586.pl
+++ b/crypto/bf/asm/bf-586.pl
@@ -4,7 +4,7 @@ push(@INC,"perlasm","../../perlasm");
 require "x86asm.pl";
 require "cbc.pl";
 
-&asm_init($ARGV[0],"bf-586.pl");
+&asm_init($ARGV[0],"bf-586.pl",$ARGV[$#ARGV] eq "386");
 
 $BF_ROUNDS=16;
 $BF_OFF=($BF_ROUNDS+2)*4;
diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl
index 72ae8dec8a..0834c09c13 100644
--- a/crypto/cast/Makefile.ssl
+++ b/crypto/cast/Makefile.ssl
@@ -67,7 +67,7 @@ asm/cx86bsdi.o: asm/cx86unix.cpp
 	$(CPP) -DBSDI asm/cx86unix.cpp | sed 's/ :/:/' | as -o asm/cx86bsdi.o
 
 asm/cx86unix.cpp: asm/cast-586.pl
-	(cd asm; perl cast-586.pl cpp >cx86unix.cpp)
+	(cd asm; perl cast-586.pl cpp $(PROCESSOR) >cx86unix.cpp)
 
 files:
 	perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
diff --git a/crypto/cast/asm/cast-586.pl b/crypto/cast/asm/cast-586.pl
index eda14ad413..6be0bfe572 100644
--- a/crypto/cast/asm/cast-586.pl
+++ b/crypto/cast/asm/cast-586.pl
@@ -7,7 +7,7 @@ push(@INC,"perlasm","../../perlasm");
 require "x86asm.pl";
 require "cbc.pl";
 
-&asm_init($ARGV[0],"cast-586.pl");
+&asm_init($ARGV[0],"cast-586.pl",$ARGV[$#ARGV] eq "386");
 
 $CAST_ROUNDS=16;
 $L="edi";
@@ -173,3 +173,4 @@ sub E_CAST {
     &xor(	$L,		$tmp1);
     # XXX
 }
+
diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl
index b35dd1bc53..c81910851a 100644
--- a/crypto/perlasm/x86asm.pl
+++ b/crypto/perlasm/x86asm.pl
@@ -15,14 +15,9 @@ sub main'asm_finish
 
 sub main'asm_init
 	{
-	($type,$fn)=@_;
+	($type,$fn,$i386)=@_;
 	$filename=$fn;
 
-	if ($ARGV[$#ARGV] eq "386")
-	{
-	$i386=1;
-	}
-
 	$cpp=$sol=$aout=$win32=0;
 	if (	($type eq "elf"))
 		{ require "x86unix.pl"; }
@@ -37,8 +32,6 @@ sub main'asm_init
 	else
 		{
 		print STDERR <<"EOF";
-Usage: $filename <target> [386]
-
 Pick one target type from
 	elf	- linux, FreeBSD etc
 	a.out	- old linux
diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl
index 9214c583a8..190da3a6cf 100644
--- a/crypto/sha/Makefile.ssl
+++ b/crypto/sha/Makefile.ssl
@@ -61,7 +61,7 @@ asm/sx86bsdi.o: asm/sx86unix.cpp
 	$(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | as -o asm/sx86bsdi.o
 
 asm/sx86unix.cpp:
-	(cd asm; perl sha1-586.pl cpp >sx86unix.cpp)
+	(cd asm; perl sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp)
 
 files:
 	perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
diff --git a/crypto/sha/asm/sha1-586.pl b/crypto/sha/asm/sha1-586.pl
index 38bb27532d..04e42ab09f 100644
--- a/crypto/sha/asm/sha1-586.pl
+++ b/crypto/sha/asm/sha1-586.pl
@@ -5,7 +5,7 @@ $normal=0;
 push(@INC,"perlasm","../../perlasm");
 require "x86asm.pl";
 
-&asm_init($ARGV[0],"sha1-586.pl");
+&asm_init($ARGV[0],"sha1-586.pl",$ARGV[$#ARGV] eq "386");
 
 $A="eax";
 $B="ebx";