summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2004-12-26 10:58:39 +0000
committerAndy Polyakov <appro@openssl.org>2004-12-26 10:58:39 +0000
commit556b8f3f77d94b4d720e4ea488cf557a952fdc9b (patch)
tree5fe6861745cee2d658a7ea9904054940f02908d7 /crypto
parent045d3285e27cd788c42328e8287c8f95a113c809 (diff)
Engage AES x86 assembler module for COFF and a.out targets.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/aes/Makefile.ssl8
-rw-r--r--crypto/perlasm/x86ms.pl2
-rw-r--r--crypto/perlasm/x86nasm.pl2
3 files changed, 6 insertions, 6 deletions
diff --git a/crypto/aes/Makefile.ssl b/crypto/aes/Makefile.ssl
index 85007bd050..2bf743ec30 100644
--- a/crypto/aes/Makefile.ssl
+++ b/crypto/aes/Makefile.ssl
@@ -54,11 +54,11 @@ asm/aes-ia64.s: asm/aes-ia64.S
$(CC) $(CFLAGS) -E asm/aes-ia64.S > $@
asm/ax86-elf.s: asm/aes-586.pl ../perlasm/x86asm.pl
- (cd asm; $(PERL) aes-586.pl elf $(CFLAGS) > ../$@)
+ (cd asm; $(PERL) aes-586.pl elf $(CFLAGS) $(PROCESSOR) > ../$@)
asm/ax86-cof.s: asm/aes-586.pl ../perlasm/x86asm.pl
- (cd asm; $(PERL) aes-586.pl coff $(CFLAGS) > ../$@)
-asm/ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl
- (cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) > ../$@)
+ (cd asm; $(PERL) aes-586.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
+ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl
+ (cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
files:
$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
diff --git a/crypto/perlasm/x86ms.pl b/crypto/perlasm/x86ms.pl
index 8f77fed81e..41fe9715de 100644
--- a/crypto/perlasm/x86ms.pl
+++ b/crypto/perlasm/x86ms.pl
@@ -92,7 +92,7 @@ sub get_mem
$reg2=&conv($1);
$addr="_$2";
}
- elsif ($addr =~ /^[_a-zA-Z]$/)
+ elsif ($addr =~ /^[_a-z][_a-z0-9]*$/i)
{
$addr="_$addr";
}
diff --git a/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl
index 1b6e94c17e..9792f13e1f 100644
--- a/crypto/perlasm/x86nasm.pl
+++ b/crypto/perlasm/x86nasm.pl
@@ -106,7 +106,7 @@ sub get_mem
$reg2=&conv($1);
$addr="$under$2";
}
- elsif ($addr =~ /^[_a-zA-Z]$/)
+ elsif ($addr =~ /^[_a-z][_a-z0-9]*$/i)
{
$addr="$under$addr";
}