From 6219d2c294e4c8a4cf6c80c3c15dd6c3ea321e74 Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Mon, 26 Jul 2010 21:56:16 +0000
Subject: [PATCH] rc4-s390x.pl: harmonize build rule with other similar rules.

---
 crypto/rc4/Makefile         | 6 +++---
 crypto/rc4/asm/rc4-s390x.pl | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/crypto/rc4/Makefile b/crypto/rc4/Makefile
index 3f467a68fd..aa25be6fff 100644
--- a/crypto/rc4/Makefile
+++ b/crypto/rc4/Makefile
@@ -50,9 +50,6 @@ rc4-x86_64.s: asm/rc4-x86_64.pl
 rc4-ia64.S: asm/rc4-ia64.pl
 	$(PERL) asm/rc4-ia64.pl $(CFLAGS) > $@
 
-rc4-s390x.s:	asm/rc4-s390x.pl
-	$(PERL) asm/rc4-s390x.pl > $@
-
 rc4-parisc.s:	asm/rc4-parisc.pl
 	$(PERL) asm/rc4-parisc.pl $(PERLASM_SCHEME) $@
 
@@ -63,6 +60,9 @@ rc4-ia64.s: rc4-ia64.S
 	*)	exit 1 ;; \
 	esac
 
+# GNU make "catch all"
+rc4-%.s:	asm/rc4-%.pl;	$(PERL) $< $(PERLASM_SCHEME) $@
+
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
diff --git a/crypto/rc4/asm/rc4-s390x.pl b/crypto/rc4/asm/rc4-s390x.pl
index 96681fa05e..f26c515e78 100644
--- a/crypto/rc4/asm/rc4-s390x.pl
+++ b/crypto/rc4/asm/rc4-s390x.pl
@@ -13,6 +13,9 @@
 # "cluster" Address Generation Interlocks, so that one pipeline stall
 # resolves several dependencies.
 
+while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {}
+open STDOUT,">$output";
+
 $rp="%r14";
 $sp="%r15";
 $code=<<___;
@@ -203,3 +206,4 @@ RC4_options:
 ___
 
 print $code;
+close STDOUT;	# force flush
-- 
2.34.1