Some assembler-related clean-ups.

diff --git a/Configure b/Configure
index 12b25f1c53fece56dd8788fa9c296866a3e9e96e..22afe77ac53d91ff86d084be9b98c0a66eb0cf74 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -367,6 +367,14 @@ foreach (@ARGV)
        $options .= $_ unless $_ eq $target;
 }
 
+if ($target eq "TABLE") {
+       foreach $target (sort keys %table) {
+               print_table_entry($target);
+       }
+       print "\n";
+       exit 0;
+}
+
 &usage if (!defined($table{$target}));
 
 my $IsWindows=scalar grep /^$target$/,@WinTargets;
@@ -757,3 +765,32 @@ sub dofile
        rename($f,"$ff.bak") || die "unable to rename $f\n" if -e $f;
        rename("$ff.new",$f) || die "unable to rename $ff.new\n";
        }
+
+sub print_table_entry
+       {
+       my $target = shift;
+
+       (my $cc,my $cflags,my $thread_cflag,my $lflags,my $bn_ops,
+       my $bn_obj,my $des_obj,my $bf_obj,
+       $md5_obj,$sha1_obj,my $cast_obj,my $rc4_obj,$rmd160_obj,my $rc5_obj)=
+       split(/\s*:\s*/,$table{$target} . ":" x 20 , -1);
+                       
+       print <<EOF
+
+*** $target
+\$cc           = $cc
+\$cflags       = $cflags
+\$thread_cflag = $thread_cflag
+\$lflags       = $lflags
+\$bn_ops       = $bn_ops
+\$bn_obj       = $bn_obj
+\$des_obj      = $des_obj
+\$bf_obj       = $bf_obj
+\$md5_obj      = $md5_obj
+\$sha1_obj     = $sha1_obj
+\$cast_obj     = $cast_obj
+\$rc4_obj      = $rc4_obj
+\$rmd160_obj   = $rmd160_obj
+\$rc5_obj      = $rc5_obj
+EOF
+       }

diff --git a/INSTALL b/INSTALL
index b9bf16233784a78fc6ef46b29ea131cb01aee6e8..b604fa2a005478dae553131f5158dd4160d3431d 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -119,6 +119,11 @@
      Include the output of "./config -t" and the OpenSSL version
      number in your message.
 
+     [If you encounter assembler error messages, try the "no-asm"
+     configuration option as an immediate fix.  Note that on Solaris x86
+     (not on Sparcs!) you may have to install the GNU assembler to use
+     OpenSSL assembler code -- /usr/ccs/bin/as won't do.]
+
   3. After a successful build, the libraries should be tested. Run:
 
        $ make test

diff --git a/crypto/bf/Makefile.ssl b/crypto/bf/Makefile.ssl
index f23fb544942bec254b4f56793b038bff3cc42199..18bddda0db2372aa62673e4df56c989fee8e8698 100644 (file)
--- a/crypto/bf/Makefile.ssl
+++ b/crypto/bf/Makefile.ssl
@@ -100,7 +100,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+       rm -f asm/bx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl
index b27b912a4902dc8aec3a46ca4c3614c45ef88963..e42f088c0311a7fda9059dbe7c217acb4ddab3eb 100644 (file)
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -156,7 +156,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s
+       rm -f asm/co86unix.cpp asm/bn86unix.cpp *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl
index 4c3256b0d1bc5457379582bbb34f32ff2d7f32f9..4e4b543a60e13fb6d7d01acf64c2c160c11d10f7 100644 (file)
--- a/crypto/cast/Makefile.ssl
+++ b/crypto/cast/Makefile.ssl
@@ -103,7 +103,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+       rm -f asm/cx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index c0d49c8adc9730b43e9198238409ea7152700a4d..e9300e70c04c2faf5433ca541dac59fe34793d80 100644 (file)
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -132,7 +132,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+       rm -f asm/dx86unix.cpp asm/yx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/crypto/md5/Makefile.ssl b/crypto/md5/Makefile.ssl
index b9e658feacf55b89f9b6d77a0f9fad26b6690bad..3db39ae42217b040adb83b18b348f82e13930164 100644 (file)
--- a/crypto/md5/Makefile.ssl
+++ b/crypto/md5/Makefile.ssl
@@ -109,7 +109,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+       rm -f asm/mx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_locl.h
index cc96bf50d588dfca9a2ee210c8b02d574b4d3cfd..222639788f28d31152a52114523d3e7c67c2eb1d 100644 (file)
--- a/crypto/md5/md5_locl.h
+++ b/crypto/md5/md5_locl.h
@@ -58,6 +58,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <openssl/opensslconf.h>
 #include <openssl/md5.h>
 
 #ifndef MD5_LONG_LOG2

diff --git a/crypto/rc4/Makefile.ssl b/crypto/rc4/Makefile.ssl
index 0c6637e63abaf5bab62f86920333dde822c6949a..64092fd4f1cfae655f8d6fdd319e3ac9b0a0e7a5 100644 (file)
--- a/crypto/rc4/Makefile.ssl
+++ b/crypto/rc4/Makefile.ssl
@@ -102,7 +102,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o
+       rm -f asm/rx86unix.cpp *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/crypto/rc5/Makefile.ssl b/crypto/rc5/Makefile.ssl
index d0161d13ce7284403fdabbb478dc73a373f5e1ba..666c4b6539e57fccc1946539809986d1da6c151f 100644 (file)
--- a/crypto/rc5/Makefile.ssl
+++ b/crypto/rc5/Makefile.ssl
@@ -100,7 +100,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+       rm -f asm/r586unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/crypto/ripemd/Makefile.ssl b/crypto/ripemd/Makefile.ssl
index 5997402ca6cbe36e7ee4d4adce1cbc426a640805..b7cd25f1233fbfe543a07b7e945514620211e7fa 100644 (file)
--- a/crypto/ripemd/Makefile.ssl
+++ b/crypto/ripemd/Makefile.ssl
@@ -98,7 +98,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+       rm -f asm/rm86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl
index 1477a530890b1737cfb5ff58780367279fcd835b..cf53ca4db6f883c100831b707c184cb3911087bc 100644 (file)
--- a/crypto/sha/Makefile.ssl
+++ b/crypto/sha/Makefile.ssl
@@ -97,7 +97,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o
+       rm -f asm/sx86unix.cpp *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.