diff options
| author | Andy Polyakov <appro@openssl.org> | 2010-07-08 15:03:42 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2010-07-08 15:03:42 +0000 |
| commit | 396df7311e599e6fa0d6500e644194e57cd655d2 (patch) | |
| tree | 5d251cba48c519505eda00b59c65a85f28ff55d2 /crypto/aes | |
| parent | f04f3873f87d7b181913b2c423f44278792195d9 (diff) | |
crypto/*/Makefile: unify "catch-all" assembler make rules and harmonize
ARM assembler modules.
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/Makefile | 2 | ||||
| -rw-r--r-- | crypto/aes/asm/aes-armv4.pl | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile index 71db995736..8ed82c9238 100644 --- a/crypto/aes/Makefile +++ b/crypto/aes/Makefile @@ -68,7 +68,7 @@ aes-parisc.s: asm/aes-parisc.pl $(PERL) asm/aes-parisc.pl $(PERLASM_SCHEME) $@ # GNU make "catch all" -aes-%.s: asm/aes-%.pl; $(PERL) $< $(CFLAGS) > $@ +aes-%.s: asm/aes-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@ files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl index 690244111a..5a736744a9 100644 --- a/crypto/aes/asm/aes-armv4.pl +++ b/crypto/aes/asm/aes-armv4.pl @@ -22,6 +22,9 @@ # # AES_set_[en|de]crypt_key is added. +while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +open STDOUT,">$output"; + $s0="r0"; $s1="r1"; $s2="r2"; @@ -1029,3 +1032,4 @@ ___ $code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm; # make it possible to compile with -march=armv4 print $code; +close STDOUT; # enforce flush |