From 1416aec60ddd7abe4fc86a0e9d0b2a658cbb3400 Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Wed, 12 Nov 2008 08:19:04 +0000
Subject: Update make rules for x86_64 assembler pack.

---
 crypto/Makefile          | 2 +-
 crypto/aes/Makefile      | 2 +-
 crypto/bn/Makefile       | 2 +-
 crypto/md5/Makefile      | 3 ++-
 crypto/rc4/Makefile      | 3 ++-
 crypto/sha/Makefile      | 6 +++---
 crypto/whrlpool/Makefile | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/crypto/Makefile b/crypto/Makefile
index 2987a81b95..98b2f83939 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -71,7 +71,7 @@ uplink-cof.s:	$(TOP)/ms/uplink.pl
 	$(PERL) $(TOP)/ms/uplink.pl coff > $@
 
 x86_64cpuid.s: x86_64cpuid.pl
-	$(PERL) x86_64cpuid.pl $@
+	$(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
 ia64cpuid.s: ia64cpuid.S
 	$(CC) $(CFLAGS) -E ia64cpuid.S > $@
 ppccpuid.s:		ppccpuid.pl;	$(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile
index 7a55dd6ca5..4c22daf86f 100644
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -52,7 +52,7 @@ aes-586.s:	asm/aes-586.pl ../perlasm/x86asm.pl
 	$(PERL) asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
 aes-x86_64.s: asm/aes-x86_64.pl
-	$(PERL) asm/aes-x86_64.pl $@
+	$(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@
 
 aes-sparcv9.s: asm/aes-sparcv9.pl
 	$(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@
diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 9ad6bbabf9..aabc4f56b8 100644
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -88,7 +88,7 @@ bn-s390x.o:	asm/s390x.S
 x86_64-gcc.o:	asm/x86_64-gcc.c
 	$(CC) $(CFLAGS) -c -o $@ asm/x86_64-gcc.c
 x86_64-mont.s:	asm/x86_64-mont.pl
-	$(PERL) asm/x86_64-mont.pl $@
+	$(PERL) asm/x86_64-mont.pl $(PERLASM_SCHEME) > $@
 
 bn-ia64.s:	asm/ia64.S
 	$(CC) $(CFLAGS) -E asm/ia64.S > $@
diff --git a/crypto/md5/Makefile b/crypto/md5/Makefile
index 7ee800350a..9858d53d31 100644
--- a/crypto/md5/Makefile
+++ b/crypto/md5/Makefile
@@ -45,7 +45,8 @@ lib:    $(LIBOBJ)
 md5-586.s:	asm/md5-586.pl ../perlasm/x86asm.pl
 	$(PERL) asm/md5-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
 
-md5-x86_64.s:	asm/md5-x86_64.pl;	$(PERL) asm/md5-x86_64.pl $@
+md5-x86_64.s:	asm/md5-x86_64.pl
+	$(PERL) asm/md5-x86_64.pl $(PERLASM_SCHEME) > $@
 
 md5-ia64.s: asm/md5-ia64.S
 	$(CC) $(CFLAGS) -E asm/md5-ia64.S | \
diff --git a/crypto/rc4/Makefile b/crypto/rc4/Makefile
index b3d4aa418c..f932a89035 100644
--- a/crypto/rc4/Makefile
+++ b/crypto/rc4/Makefile
@@ -44,7 +44,8 @@ lib:	$(LIBOBJ)
 rc4-586.s:	asm/rc4-586.pl ../perlasm/x86asm.pl
 	$(PERL) asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
 
-rc4-x86_64.s: asm/rc4-x86_64.pl;	$(PERL) asm/rc4-x86_64.pl $@
+rc4-x86_64.s: asm/rc4-x86_64.pl
+	$(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@
 
 rc4-ia64.S: asm/rc4-ia64.pl
 	$(PERL) asm/rc4-ia64.pl $(CFLAGS) > $@
diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
index 61187ef8ae..e6eccb05f9 100644
--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@@ -60,9 +60,9 @@ sha256-armv4.s: asm/sha256-armv4.pl
 	$(PERL) $< $@
 
 # Solaris make has to be explicitly told
-sha1-x86_64.s:	asm/sha1-x86_64.pl;	$(PERL) asm/sha1-x86_64.pl $@
-sha256-x86_64.s:asm/sha512-x86_64.pl;	$(PERL) asm/sha512-x86_64.pl $@
-sha512-x86_64.s:asm/sha512-x86_64.pl;	$(PERL) asm/sha512-x86_64.pl $@
+sha1-x86_64.s:	asm/sha1-x86_64.pl;	$(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@
+sha256-x86_64.s:asm/sha512-x86_64.pl;	$(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@
+sha512-x86_64.s:asm/sha512-x86_64.pl;	$(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@
 sha1-sparcv9.s:	asm/sha1-sparcv9.pl;	$(PERL) asm/sha1-sparcv9.pl $@ $(CFLAGS)
 sha256-sparcv9.s:asm/sha512-sparcv9.pl;	$(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS)
 sha512-sparcv9.s:asm/sha512-sparcv9.pl;	$(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS)
diff --git a/crypto/whrlpool/Makefile b/crypto/whrlpool/Makefile
index e4ab00b7e6..566b996290 100644
--- a/crypto/whrlpool/Makefile
+++ b/crypto/whrlpool/Makefile
@@ -46,7 +46,7 @@ wp-mmx.s:	asm/wp-mmx.pl ../perlasm/x86asm.pl
 	$(PERL) asm/wp-mmx.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
 wp-x86_64.s: asm/wp-x86_64.pl
-	$(PERL) asm/wp-x86_64.pl $@
+	$(PERL) asm/wp-x86_64.pl $(PERLASM_SCHEME) > $@
 
 $(LIBOBJ): $(LIBSRC)
 
-- 
cgit v1.2.3