> You mean the bit about target type? But the scripts actually pass that
> in, it isn't picked off the command line, nor does it say where it comes
> from.


Index: bf/Makefile.ssl
===================================================================
RCS file: /e/openssl/cvs/openssl/crypto/bf/Makefile.ssl,v
retrieving revision 1.6
diff -u -r1.6 Makefile.ssl
--- bf/Makefile.ssl     1999/03/22 12:21:21     1.6
+++ bf/Makefile.ssl     1999/03/30 17:59:39
@@ -64,7 +64,7 @@
        $(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
Index: bf/asm/bf-586.pl
===================================================================
RCS file: /e/openssl/cvs/openssl/crypto/bf/asm/bf-586.pl,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bf-586.pl
--- bf/asm/bf-586.pl    1998/12/21 10:54:40     1.1.1.1
+++ bf/asm/bf-586.pl    1999/03/31 00:12:35
@@ -4,7 +4,7 @@
 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;
Index: cast/Makefile.ssl
===================================================================
RCS file: /e/openssl/cvs/openssl/crypto/cast/Makefile.ssl,v
retrieving revision 1.7
diff -u -r1.7 Makefile.ssl
--- cast/Makefile.ssl   1999/03/22 12:21:26     1.7
+++ cast/Makefile.ssl   1999/03/30 17:59:52
@@ -67,7 +67,7 @@
        $(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
Index: cast/asm/cast-586.pl
===================================================================
RCS file: /e/openssl/cvs/openssl/crypto/cast/asm/cast-586.pl,v
retrieving revision 1.2
diff -u -r1.2 cast-586.pl
--- cast/asm/cast-586.pl        1999/01/17 16:26:24     1.2
+++ cast/asm/cast-586.pl        1999/03/31 00:12:53
@@ -7,7 +7,7 @@
 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 @@
     &xor(      $L,             $tmp1);
     # XXX
 }
+
Index: perlasm/x86asm.pl
===================================================================
RCS file: /e/openssl/cvs/openssl/crypto/perlasm/x86asm.pl,v
retrieving revision 1.2
diff -u -r1.2 x86asm.pl
--- perlasm/x86asm.pl   1999/03/30 12:49:36     1.2
+++ perlasm/x86asm.pl   1999/03/31 00:10:52
@@ -15,14 +15,9 @@
 
 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 @@
        else
                {
                print STDERR <<"EOF";
-Usage: $filename <target> [386]
-
 Pick one target type from
        elf     - linux, FreeBSD etc
        a.out   - old linux
Index: sha/Makefile.ssl
===================================================================
RCS file: /e/openssl/cvs/openssl/crypto/sha/Makefile.ssl,v
retrieving revision 1.6
diff -u -r1.6 Makefile.ssl
--- sha/Makefile.ssl    1999/03/22 12:21:54     1.6
+++ sha/Makefile.ssl    1999/03/30 18:00:10
@@ -61,7 +61,7 @@
        $(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
Index: sha/asm/sha1-586.pl
===================================================================
RCS file: /e/openssl/cvs/openssl/crypto/sha/asm/sha1-586.pl,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sha1-586.pl
--- sha/asm/sha1-586.pl 1998/12/21 10:55:39     1.1.1.1
+++ sha/asm/sha1-586.pl 1999/03/31 00:11:51
@@ -5,7 +5,7 @@
 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";

______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
Development Mailing List                       [EMAIL PROTECTED]
Automated List Manager                           [EMAIL PROTECTED]

Reply via email to