Here's the patch to allow Solaris-x86-gcc to use a different
assembler than the default stock assembler. Also, I have an installable
package for 'gas' (the GNU assembler) for Solaris/Intel 2.7, if anyone
wants to install it instead of the compiling GNU assembler themselves.
Please send me email if you'd like to get it.
Question for the FTP maintainer of ftp.openssl.com: If I were to
create an installable image for Solaris/Sparc 2.6, Solaris/Sparc 2.7,
Solaris/Intel 2.6, and Solaris/Intel 2.6; would you archive it on the
ftp site?
Steve
diff -ur3 openssl-SNAP-19990304/Configure
openssl-SNAP-19990304.new/Configure
--- openssl-SNAP-19990304/Configure Thu Feb 25 02:00:02 1999
+++ openssl-SNAP-19990304.new/Configure Thu Mar 4 23:45:10 1999
@@ -92,7 +92,7 @@
# My solaris setups
-"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall
-DL_ENDIAN:-lsocket -lnsl:BN_LLONG $x86_gcc_des
$x86_gcc_opts:$x86_sol_asm",
+"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall
-DL_ENDIAN:-lsocket -lnsl:BN_LLONG $x86_gcc_des
$x86_gcc_opts:$x86_sol_asm:gas",
"solaris-sparc-gcc","gcc:-O3 -fomit-frame-pointer -mv8 -Wall
-DB_ENDIAN:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:::",
# DO NOT use /xO[34] on sparc with SC3.0.
# It is broken, and will not pass the tests
@@ -265,6 +265,7 @@
my $md5_obj="";
my $sha1_obj="";
my $rmd160_obj="";
+my $as="as";
if ($#ARGV < 0)
{
@@ -313,7 +314,7 @@
}
(my $cc,my $cflags,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)=
+ $md5_obj,$sha1_obj,my $cast_obj,my $rc4_obj,$rmd160_obj,my $rc5_obj,
$as)=
split(/\s*:\s*/,$table{$target} . ":" x 20 , -1);
$cflags="$flags$cflags" if ($flags ne "");
$lflags="$libs$lflags"if ($libs ne "");
@@ -359,6 +360,7 @@
chop;
s/^PLATFORM=.*$/PLATFORM=$target/;
s/^CC=.*$/CC= $cc/;
+ s/^AS=.*$/AS= $as/;
s/^CFLAG=.*$/CFLAG= $cflags/;
s/^EX_LIBS=.*$/EX_LIBS= $lflags/;
s/^BN_ASM=.*$/BN_ASM= $bn_obj/;
@@ -376,6 +378,7 @@
close(OUT);
print "CC =$cc\n";
+print "AS =$as\n";
print "CFLAG =$cflags\n";
print "EX_LIBS =$lflags\n";
print "BN_ASM =$bn_obj\n";
diff -ur3 openssl-SNAP-19990304/Makefile.org
openssl-SNAP-19990304.new/Makefile.org
--- openssl-SNAP-19990304/Makefile.org Wed Feb 10 01:00:02 1999
+++ openssl-SNAP-19990304.new/Makefile.org Thu Mar 4 23:44:29 1999
@@ -63,6 +63,7 @@
# PKCS1_CHECK - pkcs1 tests.
CC= gcc
+AS= as
#CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall
-Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall
-DSHA1_ASM -DMD5_ASM -DRMD160_ASM
PEX_LIBS= -L. -L.. -L../.. -L../../..
diff -ur3 openssl-SNAP-19990304/crypto/Makefile.ssl
openssl-SNAP-19990304.new/crypto/Makefile.ssl
--- openssl-SNAP-19990304/crypto/Makefile.ssl Sun Jan 31 08:00:05 1999
+++ openssl-SNAP-19990304.new/crypto/Makefile.ssl Fri Mar 5 00:23:44
1999
@@ -56,7 +56,7 @@
@for i in $(SDIRS) ;\
do \
(cd $$i && echo "making all in $$i..." && \
- $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}'
INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'
BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'
MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'
BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}'
RC5_ENC='${RC5_ENC}' AR='${AR}' all ) || exit 1; \
+ $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}'
INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'
BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'
MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'
BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}'
RC5_ENC='${RC5_ENC}' AR='${AR}' AS='${AS}' all ) || exit 1; \
done;
files:
@@ -89,14 +89,14 @@
@for i in $(SDIRS) ;\
do \
(cd $$i; echo "making libs in $$i..."; \
- $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}'
PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \
+ $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}'
PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' AS=${AS}' lib );
\
done;
tests:
@for i in $(SDIRS) ;\
do \
(cd $$i; echo "making tests in $$i..."; \
- $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}'
PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \
+ $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}'
PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' AS=${AS}' tests
); \
done;
install:
diff -ur3 openssl-SNAP-19990304/crypto/bf/Makefile.ssl
openssl-SNAP-19990304.new/crypto/bf/Makefile.ssl
--- openssl-SNAP-19990304/crypto/bf/Makefile.ssl Tue Jan 19 15:24:52
1999
+++ openssl-SNAP-19990304.new/crypto/bf/Makefile.ssl Thu Mar 4 23:52:23
1999
@@ -47,21 +47,21 @@
# elf
asm/bx86-elf.o: asm/bx86unix.cpp
- $(CPP) -DELF asm/bx86unix.cpp | as -o asm/bx86-elf.o
+ $(CPP) -DELF asm/bx86unix.cpp | $(AS) -o asm/bx86-elf.o
# solaris
asm/bx86-sol.o: asm/bx86unix.cpp
$(CC) -E -DSOL asm/bx86unix.cpp | sed 's/^#.*//' > asm/bx86-sol.s
- as -o asm/bx86-sol.o asm/bx86-sol.s
+ $(AS) -o asm/bx86-sol.o asm/bx86-sol.s
rm -f asm/bx86-sol.s
# a.out
asm/bx86-out.o: asm/bx86unix.cpp
- $(CPP) -DOUT asm/bx86unix.cpp | as -o asm/bx86-out.o
+ $(CPP) -DOUT asm/bx86unix.cpp | $(AS) -o asm/bx86-out.o
# bsdi
asm/bx86bsdi.o: asm/bx86unix.cpp
- $(CPP) -DBSDI asm/bx86unix.cpp | sed 's/ :/:/' | as -o asm/bx86bsdi.o
+ $(CPP) -DBSDI asm/bx86unix.cpp | sed 's/ :/:/' | $(AS) -o
asm/bx86bsdi.o
asm/bx86unix.cpp:
(cd asm; perl bf-586.pl cpp >bx86unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/bf/Makefile.uni
openssl-SNAP-19990304.new/crypto/bf/Makefile.uni
--- openssl-SNAP-19990304/crypto/bf/Makefile.uni Mon Dec 21 02:54:39
1998
+++ openssl-SNAP-19990304.new/crypto/bf/Makefile.uni Fri Mar 5 00:10:56
1999
@@ -28,7 +28,6 @@
CFLAGS=$(OPTS) $(CFLAG)
CPP=$(CC) -E
-AS=as
# Assember version of bf_encrypt().
BF_ENC=bf_enc.o # normal C version
@@ -85,7 +84,7 @@
# solaris
asm/bx86-sol.o: asm/bx86unix.cpp
$(CC) -E -DSOL asm/bx86unix.cpp | sed 's/^#.*//' > asm/bx86-sol.s
- as -o asm/bx86-sol.o asm/bx86-sol.s
+ $(AS) -o asm/bx86-sol.o asm/bx86-sol.s
rm -f asm/bx86-sol.s
# a.out
diff -ur3 openssl-SNAP-19990304/crypto/bn/Makefile.ssl
openssl-SNAP-19990304.new/crypto/bn/Makefile.ssl
--- openssl-SNAP-19990304/crypto/bn/Makefile.ssl Fri Feb 12 12:00:06
1999
+++ openssl-SNAP-19990304.new/crypto/bn/Makefile.ssl Fri Mar 5 00:01:01
1999
@@ -62,35 +62,35 @@
# elf
asm/bn86-elf.o: asm/bn86unix.cpp
- $(CPP) -DELF asm/bn86unix.cpp | as -o asm/bn86-elf.o
+ $(CPP) -DELF asm/bn86unix.cpp | $(AS) -o asm/bn86-elf.o
asm/co86-elf.o: asm/co86unix.cpp
- $(CPP) -DELF asm/co86unix.cpp | as -o asm/co86-elf.o
+ $(CPP) -DELF asm/co86unix.cpp | $(AS) -o asm/co86-elf.o
# solaris
asm/bn86-sol.o: asm/bn86unix.cpp
$(CC) -E -DSOL asm/bn86unix.cpp | sed 's/^#.*//' > asm/bn86-sol.s
- as -o asm/bn86-sol.o asm/bn86-sol.s
+ $(AS) -o asm/bn86-sol.o asm/bn86-sol.s
rm -f asm/bn86-sol.s
asm/co86-sol.o: asm/co86unix.cpp
$(CC) -E -DSOL asm/co86unix.cpp | sed 's/^#.*//' > asm/co86-sol.s
- as -o asm/co86-sol.o asm/co86-sol.s
+ $(AS) -o asm/co86-sol.o asm/co86-sol.s
rm -f asm/co86-sol.s
# a.out
asm/bn86-out.o: asm/bn86unix.cpp
- $(CPP) -DOUT asm/bn86unix.cpp | as -o asm/bn86-out.o
+ $(CPP) -DOUT asm/bn86unix.cpp | $(AS) -o asm/bn86-out.o
asm/co86-out.o: asm/co86unix.cpp
- $(CPP) -DOUT asm/co86unix.cpp | as -o asm/co86-out.o
+ $(CPP) -DOUT asm/co86unix.cpp | $(AS) -o asm/co86-out.o
# bsdi
asm/bn86bsdi.o: asm/bn86unix.cpp
- $(CPP) -DBSDI asm/bn86unix.cpp | sed 's/ :/:/' | as -o asm/bn86bsdi.o
+ $(CPP) -DBSDI asm/bn86unix.cpp | sed 's/ :/:/' | $(AS) -o
asm/bn86bsdi.o
asm/co86bsdi.o: asm/co86unix.cpp
- $(CPP) -DBSDI asm/co86unix.cpp | sed 's/ :/:/' | as -o asm/co86bsdi.o
+ $(CPP) -DBSDI asm/co86unix.cpp | sed 's/ :/:/' | $(AS) -o
asm/co86bsdi.o
asm/bn86unix.cpp: asm/bn-586.pl
(cd asm; perl bn-586.pl cpp >bn86unix.cpp )
diff -ur3 openssl-SNAP-19990304/crypto/cast/Makefile.ssl
openssl-SNAP-19990304.new/crypto/cast/Makefile.ssl
--- openssl-SNAP-19990304/crypto/cast/Makefile.ssl Tue Jan 19 15:24:55
1999
+++ openssl-SNAP-19990304.new/crypto/cast/Makefile.ssl Fri Mar 5
00:01:13 1999
@@ -50,21 +50,21 @@
# elf
asm/cx86-elf.o: asm/cx86unix.cpp
- $(CPP) -DELF asm/cx86unix.cpp | as -o asm/cx86-elf.o
+ $(CPP) -DELF asm/cx86unix.cpp | $(AS) -o asm/cx86-elf.o
# solaris
asm/cx86-sol.o: asm/cx86unix.cpp
$(CC) -E -DSOL asm/cx86unix.cpp | sed 's/^#.*//' > asm/cx86-sol.s
- as -o asm/cx86-sol.o asm/cx86-sol.s
+ $(AS) -o asm/cx86-sol.o asm/cx86-sol.s
rm -f asm/cx86-sol.s
# a.out
asm/cx86-out.o: asm/cx86unix.cpp
- $(CPP) -DOUT asm/cx86unix.cpp | as -o asm/cx86-out.o
+ $(CPP) -DOUT asm/cx86unix.cpp | $(AS) -o asm/cx86-out.o
# bsdi
asm/cx86bsdi.o: asm/cx86unix.cpp
- $(CPP) -DBSDI asm/cx86unix.cpp | sed 's/ :/:/' | as -o asm/cx86bsdi.o
+ $(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)
diff -ur3 openssl-SNAP-19990304/crypto/cast/Makefile.uni
openssl-SNAP-19990304.new/crypto/cast/Makefile.uni
--- openssl-SNAP-19990304/crypto/cast/Makefile.uni Mon Dec 21 02:54:50
1998
+++ openssl-SNAP-19990304.new/crypto/cast/Makefile.uni Thu Mar 4
23:53:43 1999
@@ -58,21 +58,21 @@
sh $(TOP)/ranlib.sh $(LIB)
# elf
asm/cx86-elf.o: asm/cx86unix.cpp
- $(CPP) -DELF asm/cx86unix.cpp | as -o asm/cx86-elf.o
+ $(CPP) -DELF asm/cx86unix.cpp | $(AS) -o asm/cx86-elf.o
# solaris
asm/cx86-sol.o: asm/cx86unix.cpp
$(CC) -E -DSOL asm/cx86unix.cpp | sed 's/^#.*//' > asm/cx86-sol.s
- as -o asm/cx86-sol.o asm/cx86-sol.s
+ $(AS) -o asm/cx86-sol.o asm/cx86-sol.s
rm -f asm/cx86-sol.s
# a.out
asm/cx86-out.o: asm/cx86unix.cpp
- $(CPP) -DOUT asm/cx86unix.cpp | as -o asm/cx86-out.o
+ $(CPP) -DOUT asm/cx86unix.cpp | $(AS) -o asm/cx86-out.o
# bsdi
asm/cx86bsdi.o: asm/cx86unix.cpp
- $(CPP) -DBSDI asm/cx86unix.cpp | as -o asm/cx86bsdi.o
+ $(CPP) -DBSDI asm/cx86unix.cpp | $(AS) -o asm/cx86bsdi.o
asm/cx86unix.cpp:
(cd asm; perl cast-586.pl cpp >cx86unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/des/Makefile.lit
openssl-SNAP-19990304.new/crypto/des/Makefile.lit
--- openssl-SNAP-19990304/crypto/des/Makefile.lit Mon Dec 21 02:55:00
1998
+++ openssl-SNAP-19990304.new/crypto/des/Makefile.lit Fri Mar 5
00:11:07 1999
@@ -50,7 +50,6 @@
CFLAGS=$(OPTS) $(CFLAG)
CPP=$(CC) -E
-AS=as
# Assember version of des_encrypt*().
DES_ENC=des_enc.o fcrypt_b.o # normal C version
diff -ur3 openssl-SNAP-19990304/crypto/des/Makefile.ssl
openssl-SNAP-19990304.new/crypto/des/Makefile.ssl
--- openssl-SNAP-19990304/crypto/des/Makefile.ssl Sat Feb 13 12:00:07
1999
+++ openssl-SNAP-19990304.new/crypto/des/Makefile.ssl Fri Mar 5
00:01:21 1999
@@ -59,35 +59,35 @@
# elf
asm/dx86-elf.o: asm/dx86unix.cpp
- $(CPP) -DELF asm/dx86unix.cpp | as -o asm/dx86-elf.o
+ $(CPP) -DELF asm/dx86unix.cpp | $(AS) -o asm/dx86-elf.o
asm/yx86-elf.o: asm/yx86unix.cpp
- $(CPP) -DELF asm/yx86unix.cpp | as -o asm/yx86-elf.o
+ $(CPP) -DELF asm/yx86unix.cpp | $(AS) -o asm/yx86-elf.o
# solaris
asm/dx86-sol.o: asm/dx86unix.cpp
$(CC) -E -DSOL asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s
- as -o asm/dx86-sol.o asm/dx86-sol.s
+ $(AS) -o asm/dx86-sol.o asm/dx86-sol.s
rm -f asm/dx86-sol.s
asm/yx86-sol.o: asm/yx86unix.cpp
$(CC) -E -DSOL asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s
- as -o asm/yx86-sol.o asm/yx86-sol.s
+ $(AS) -o asm/yx86-sol.o asm/yx86-sol.s
rm -f asm/yx86-sol.s
# a.out
asm/dx86-out.o: asm/dx86unix.cpp
- $(CPP) -DOUT asm/dx86unix.cpp | as -o asm/dx86-out.o
+ $(CPP) -DOUT asm/dx86unix.cpp | $(AS) -o asm/dx86-out.o
asm/yx86-out.o: asm/yx86unix.cpp
- $(CPP) -DOUT asm/yx86unix.cpp | as -o asm/yx86-out.o
+ $(CPP) -DOUT asm/yx86unix.cpp | $(AS) -o asm/yx86-out.o
# bsdi
asm/dx86bsdi.o: asm/dx86unix.cpp
- $(CPP) -DBSDI asm/dx86unix.cpp | sed 's/ :/:/' | as -o asm/dx86bsdi.o
+ $(CPP) -DBSDI asm/dx86unix.cpp | sed 's/ :/:/' | $(AS) -o
asm/dx86bsdi.o
asm/yx86bsdi.o: asm/yx86unix.cpp
- $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o
+ $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | $(AS) -o
asm/yx86bsdi.o
asm/dx86unix.cpp: asm/des-586.pl
(cd asm; perl des-586.pl cpp >dx86unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/des/Makefile.uni
openssl-SNAP-19990304.new/crypto/des/Makefile.uni
--- openssl-SNAP-19990304/crypto/des/Makefile.uni Mon Dec 21 02:55:01
1998
+++ openssl-SNAP-19990304.new/crypto/des/Makefile.uni Fri Mar 5
00:11:40 1999
@@ -50,7 +50,6 @@
CFLAGS=$(OPTS) $(CFLAG)
CPP=$(CC) -E
-AS=as
# Assember version of des_encrypt*().
DES_ENC=des_enc.o fcrypt_b.o # normal C version
@@ -135,12 +134,12 @@
# solaris
asm/dx86-sol.o: asm/dx86unix.cpp
$(CC) -E -DSOL asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s
- as -o asm/dx86-sol.o asm/dx86-sol.s
+ ($AS) -o asm/dx86-sol.o asm/dx86-sol.s
rm -f asm/dx86-sol.s
asm/yx86-sol.o: asm/yx86unix.cpp
$(CC) -E -DSOL asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s
- as -o asm/yx86-sol.o asm/yx86-sol.s
+ ($AS) -o asm/yx86-sol.o asm/yx86-sol.s
rm -f asm/yx86-sol.s
# a.out
diff -ur3 openssl-SNAP-19990304/crypto/md2/Makefile.ssl
openssl-SNAP-19990304.new/crypto/md2/Makefile.ssl
--- openssl-SNAP-19990304/crypto/md2/Makefile.ssl Tue Jan 19 15:25:07
1999
+++ openssl-SNAP-19990304.new/crypto/md2/Makefile.ssl Fri Mar 5
00:07:21 1999
@@ -2,7 +2,7 @@
# SSLeay/crypto/md/Makefile
#
-DIR= md
+DIR= md2
TOP= ../..
CC= cc
INCLUDES=
diff -ur3 openssl-SNAP-19990304/crypto/md5/Makefile.ssl
openssl-SNAP-19990304.new/crypto/md5/Makefile.ssl
--- openssl-SNAP-19990304/crypto/md5/Makefile.ssl Sat Jan 30 10:00:09
1999
+++ openssl-SNAP-19990304.new/crypto/md5/Makefile.ssl Fri Mar 5
00:01:27 1999
@@ -45,21 +45,21 @@
# elf
asm/mx86-elf.o: asm/mx86unix.cpp
- $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o
+ $(CPP) -DELF asm/mx86unix.cpp | $(AS) -o asm/mx86-elf.o
# solaris
asm/mx86-sol.o: asm/mx86unix.cpp
$(CC) -E -DSOL asm/mx86unix.cpp | sed 's/^#.*//' > asm/mx86-sol.s
- as -o asm/mx86-sol.o asm/mx86-sol.s
+ $(AS) -o asm/mx86-sol.o asm/mx86-sol.s
rm -f asm/mx86-sol.s
# a.out
asm/mx86-out.o: asm/mx86unix.cpp
- $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o
+ $(CPP) -DOUT asm/mx86unix.cpp | $(AS) -o asm/mx86-out.o
# bsdi
asm/mx86bsdi.o: asm/mx86unix.cpp
- $(CPP) -DBSDI asm/mx86unix.cpp | sed 's/ :/:/' | as -o asm/mx86bsdi.o
+ $(CPP) -DBSDI asm/mx86unix.cpp | sed 's/ :/:/' | $(AS) -o
asm/mx86bsdi.o
asm/mx86unix.cpp: asm/md5-586.pl
(cd asm; perl md5-586.pl cpp >mx86unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/md5/Makefile.uni
openssl-SNAP-19990304.new/crypto/md5/Makefile.uni
--- openssl-SNAP-19990304/crypto/md5/Makefile.uni Mon Dec 21 02:55:26
1998
+++ openssl-SNAP-19990304.new/crypto/md5/Makefile.uni Thu Mar 4
23:54:49 1999
@@ -47,21 +47,21 @@
# elf
asm/mx86-elf.o: asm/mx86unix.cpp
- $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o
+ $(CPP) -DELF asm/mx86unix.cpp | ($AS) -o asm/mx86-elf.o
# solaris
asm/mx86-sol.o: asm/mx86unix.cpp
$(CC) -E -DSOL asm/mx86unix.cpp | sed 's/^#.*//' > asm/mx86-sol.s
- as -o asm/mx86-sol.o asm/mx86-sol.s
+ ($AS) -o asm/mx86-sol.o asm/mx86-sol.s
rm -f asm/mx86-sol.s
# a.out
asm/mx86-out.o: asm/mx86unix.cpp
- $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o
+ $(CPP) -DOUT asm/mx86unix.cpp | ($AS) -o asm/mx86-out.o
# bsdi
asm/mx86bsdi.o: asm/mx86unix.cpp
- $(CPP) -DBSDI asm/mx86unix.cpp | as -o asm/mx86bsdi.o
+ $(CPP) -DBSDI asm/mx86unix.cpp | ($AS) -o asm/mx86bsdi.o
asm/mx86unix.cpp:
(cd asm; perl md5-586.pl cpp >mx86unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/rc4/Makefile.ssl
openssl-SNAP-19990304.new/crypto/rc4/Makefile.ssl
--- openssl-SNAP-19990304/crypto/rc4/Makefile.ssl Tue Jan 19 15:25:18
1999
+++ openssl-SNAP-19990304.new/crypto/rc4/Makefile.ssl Fri Mar 5
00:01:32 1999
@@ -49,21 +49,21 @@
# elf
asm/rx86-elf.o: asm/rx86unix.cpp
- $(CPP) -DELF asm/rx86unix.cpp | as -o asm/rx86-elf.o
+ $(CPP) -DELF asm/rx86unix.cpp | $(AS) -o asm/rx86-elf.o
# solaris
asm/rx86-sol.o: asm/rx86unix.cpp
$(CC) -E -DSOL asm/rx86unix.cpp | sed 's/^#.*//' > asm/rx86-sol.s
- as -o asm/rx86-sol.o asm/rx86-sol.s
+ $(AS) -o asm/rx86-sol.o asm/rx86-sol.s
rm -f asm/rx86-sol.s
# a.out
asm/rx86-out.o: asm/rx86unix.cpp
- $(CPP) -DOUT asm/rx86unix.cpp | as -o asm/rx86-out.o
+ $(CPP) -DOUT asm/rx86unix.cpp | $(AS) -o asm/rx86-out.o
# bsdi
asm/rx86bsdi.o: asm/rx86unix.cpp
- $(CPP) -DBSDI asm/rx86unix.cpp | sed 's/ :/:/' | as -o asm/rx86bsdi.o
+ $(CPP) -DBSDI asm/rx86unix.cpp | sed 's/ :/:/' | $(AS) -o
asm/rx86bsdi.o
asm/rx86unix.cpp:
(cd asm; perl rc4-586.pl cpp >rx86unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/rc4/Makefile.uni
openssl-SNAP-19990304.new/crypto/rc4/Makefile.uni
--- openssl-SNAP-19990304/crypto/rc4/Makefile.uni Mon Dec 21 02:55:35
1998
+++ openssl-SNAP-19990304.new/crypto/rc4/Makefile.uni Thu Mar 4
23:54:56 1999
@@ -52,21 +52,21 @@
# elf
asm/rx86-elf.o: asm/rx86unix.cpp
- $(CPP) -DELF asm/rx86unix.cpp | as -o asm/rx86-elf.o
+ $(CPP) -DELF asm/rx86unix.cpp | ($AS) -o asm/rx86-elf.o
# solaris
asm/rx86-sol.o: asm/rx86unix.cpp
$(CC) -E -DSOL asm/rx86unix.cpp | sed 's/^#.*//' > asm/rx86-sol.s
- as -o asm/rx86-sol.o asm/rx86-sol.s
+ ($AS) -o asm/rx86-sol.o asm/rx86-sol.s
rm -f asm/rx86-sol.s
# a.out
asm/rx86-out.o: asm/rx86unix.cpp
- $(CPP) -DOUT asm/rx86unix.cpp | as -o asm/rx86-out.o
+ $(CPP) -DOUT asm/rx86unix.cpp | ($AS) -o asm/rx86-out.o
# bsdi
asm/rx86bsdi.o: asm/rx86unix.cpp
- $(CPP) -DBSDI asm/rx86unix.cpp | as -o asm/rx86bsdi.o
+ $(CPP) -DBSDI asm/rx86unix.cpp | ($AS) -o asm/rx86bsdi.o
asm/rx86unix.cpp:
(cd asm; perl rc4-586.pl cpp >rx86unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/rc5/Makefile.ssl
openssl-SNAP-19990304.new/crypto/rc5/Makefile.ssl
--- openssl-SNAP-19990304/crypto/rc5/Makefile.ssl Tue Jan 19 15:25:19
1999
+++ openssl-SNAP-19990304.new/crypto/rc5/Makefile.ssl Fri Mar 5
00:01:38 1999
@@ -47,21 +47,21 @@
# elf
asm/r586-elf.o: asm/r586unix.cpp
- $(CPP) -DELF asm/r586unix.cpp | as -o asm/r586-elf.o
+ $(CPP) -DELF asm/r586unix.cpp | $(AS) -o asm/r586-elf.o
# solaris
asm/r586-sol.o: asm/r586unix.cpp
$(CC) -E -DSOL asm/r586unix.cpp | sed 's/^#.*//' > asm/r586-sol.s
- as -o asm/r586-sol.o asm/r586-sol.s
+ $(AS) -o asm/r586-sol.o asm/r586-sol.s
rm -f asm/r586-sol.s
# a.out
asm/r586-out.o: asm/r586unix.cpp
- $(CPP) -DOUT asm/r586unix.cpp | as -o asm/r586-out.o
+ $(CPP) -DOUT asm/r586unix.cpp | $(AS) -o asm/r586-out.o
# bsdi
asm/r586bsdi.o: asm/r586unix.cpp
- $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | as -o asm/r586bsdi.o
+ $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | $(AS) -o
asm/r586bsdi.o
asm/r586unix.cpp:
(cd asm; perl rc5-586.pl cpp >r586unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/ripemd/Makefile.ssl
openssl-SNAP-19990304.new/crypto/ripemd/Makefile.ssl
--- openssl-SNAP-19990304/crypto/ripemd/Makefile.ssl Tue Jan 19 15:25:20
1999
+++ openssl-SNAP-19990304.new/crypto/ripemd/Makefile.ssl Fri Mar 5
00:11:27 1999
@@ -45,21 +45,21 @@
# elf
asm/rm86-elf.o: asm/rm86unix.cpp
- $(CPP) -DELF asm/rm86unix.cpp | as -o asm/rm86-elf.o
+ $(CPP) -DELF asm/rm86unix.cpp | $(AS) -o asm/rm86-elf.o
# solaris
asm/rm86-sol.o: asm/rm86unix.cpp
$(CC) -E -DSOL asm/rm86unix.cpp | sed 's/^#.*//' > asm/rm86-sol.s
- as -o asm/rm86-sol.o asm/rm86-sol.s
+ $(AS) -o asm/rm86-sol.o asm/rm86-sol.s
rm -f asm/rm86-sol.s
# a.out
asm/rm86-out.o: asm/rm86unix.cpp
- $(CPP) -DOUT asm/rm86unix.cpp | as -o asm/rm86-out.o
+ $(CPP) -DOUT asm/rm86unix.cpp | $(AS) -o asm/rm86-out.o
# bsdi
asm/rm86bsdi.o: asm/rm86unix.cpp
- $(CPP) -DBSDI asm/rm86unix.cpp | sed 's/ :/:/' | as -o asm/rm86bsdi.o
+ $(CPP) -DBSDI asm/rm86unix.cpp | sed 's/ :/:/' | $(AS) -o
asm/rm86bsdi.o
asm/rm86unix.cpp:
(cd asm; perl rmd-586.pl cpp >rm86unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/ripemd/Makefile.uni
openssl-SNAP-19990304.new/crypto/ripemd/Makefile.uni
--- openssl-SNAP-19990304/crypto/ripemd/Makefile.uni Mon Dec 21 02:55:44
1998
+++ openssl-SNAP-19990304.new/crypto/ripemd/Makefile.uni Thu Mar 4
23:55:07 1999
@@ -47,21 +47,21 @@
# elf
asm/mx86-elf.o: asm/mx86unix.cpp
- $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o
+ $(CPP) -DELF asm/mx86unix.cpp | ($AS) -o asm/mx86-elf.o
# solaris
asm/mx86-sol.o: asm/mx86unix.cpp
$(CC) -E -DSOL asm/mx86unix.cpp | sed 's/^#.*//' > asm/mx86-sol.s
- as -o asm/mx86-sol.o asm/mx86-sol.s
+ ($AS) -o asm/mx86-sol.o asm/mx86-sol.s
rm -f asm/mx86-sol.s
# a.out
asm/mx86-out.o: asm/mx86unix.cpp
- $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o
+ $(CPP) -DOUT asm/mx86unix.cpp | ($AS) -o asm/mx86-out.o
# bsdi
asm/mx86bsdi.o: asm/mx86unix.cpp
- $(CPP) -DBSDI asm/mx86unix.cpp | as -o asm/mx86bsdi.o
+ $(CPP) -DBSDI asm/mx86unix.cpp | ($AS) -o asm/mx86bsdi.o
asm/mx86unix.cpp:
(cd asm; perl md5-586.pl cpp >mx86unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/sha/Makefile.ssl
openssl-SNAP-19990304.new/crypto/sha/Makefile.ssl
--- openssl-SNAP-19990304/crypto/sha/Makefile.ssl Tue Jan 19 15:25:21
1999
+++ openssl-SNAP-19990304.new/crypto/sha/Makefile.ssl Fri Mar 5
00:01:48 1999
@@ -44,21 +44,21 @@
# elf
asm/sx86-elf.o: asm/sx86unix.cpp
- $(CPP) -DELF asm/sx86unix.cpp | as -o asm/sx86-elf.o
+ $(CPP) -DELF asm/sx86unix.cpp | $(AS) -o asm/sx86-elf.o
# solaris
asm/sx86-sol.o: asm/sx86unix.cpp
$(CC) -E -DSOL asm/sx86unix.cpp | sed 's/^#.*//' > asm/sx86-sol.s
- as -o asm/sx86-sol.o asm/sx86-sol.s
+ $(AS) -o asm/sx86-sol.o asm/sx86-sol.s
rm -f asm/sx86-sol.s
# a.out
asm/sx86-out.o: asm/sx86unix.cpp
- $(CPP) -DOUT asm/sx86unix.cpp | as -o asm/sx86-out.o
+ $(CPP) -DOUT asm/sx86unix.cpp | $(AS) -o asm/sx86-out.o
# bsdi
asm/sx86bsdi.o: asm/sx86unix.cpp
- $(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | as -o asm/sx86bsdi.o
+ $(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | $(AS) -o
asm/sx86bsdi.o
asm/sx86unix.cpp:
(cd asm; perl sha1-586.pl cpp >sx86unix.cpp)
diff -ur3 openssl-SNAP-19990304/crypto/sha/Makefile.uni
openssl-SNAP-19990304.new/crypto/sha/Makefile.uni
--- openssl-SNAP-19990304/crypto/sha/Makefile.uni Mon Dec 21 02:55:37
1998
+++ openssl-SNAP-19990304.new/crypto/sha/Makefile.uni Thu Mar 4
23:55:11 1999
@@ -53,21 +53,21 @@
# elf
asm/sx86-elf.o: asm/sx86unix.cpp
- $(CPP) -DELF asm/sx86unix.cpp | as -o asm/sx86-elf.o
+ $(CPP) -DELF asm/sx86unix.cpp | ($AS) -o asm/sx86-elf.o
# solaris
asm/sx86-sol.o: asm/sx86unix.cpp
$(CC) -E -DSOL asm/sx86unix.cpp | sed 's/^#.*//' > asm/sx86-sol.s
- as -o asm/sx86-sol.o asm/sx86-sol.s
+ ($AS) -o asm/sx86-sol.o asm/sx86-sol.s
rm -f asm/sx86-sol.s
# a.out
asm/sx86-out.o: asm/sx86unix.cpp
- $(CPP) -DOUT asm/sx86unix.cpp | as -o asm/sx86-out.o
+ $(CPP) -DOUT asm/sx86unix.cpp | ($AS) -o asm/sx86-out.o
# bsdi
asm/sx86bsdi.o: asm/sx86unix.cpp
- $(CPP) -DBSDI asm/sx86unix.cpp | as -o asm/sx86bsdi.o
+ $(CPP) -DBSDI asm/sx86unix.cpp | ($AS) -o asm/sx86bsdi.o
asm/sx86unix.cpp:
(cd asm; perl sha1-586.pl cpp >sx86unix.cpp)
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
