Commit 436a376b authored by Bodo Möller's avatar Bodo Möller
Browse files

Some assembler-related clean-ups.

parent 2e36cc41

Configure

+37 −0
Original line number Diff line number Diff line
@@ -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

	}

INSTALL

+5 −0
Original line number Diff line number Diff line
@@ -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

crypto/bf/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -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.

crypto/bn/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -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.

crypto/cast/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -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.