Switch to bn-s390x (it's faster on keys longer than 512 bits) and mention

s390x assembler pack in CHANAGES.

4 files changed, 8 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 9b43c4c546..c080030bfd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.8f and 0.9.9  [xx XXX xxxx]
 
+  *) s390x assembler pack.
+     [Andy Polyakov]
+
   *) ARMv4 assembler pack. ARMv4 refers to v4 and later ISA, not CPU
      "family."
      [Andy Polyakov]
diff --git a/Configure b/Configure
index 72005414d7..67145a4e9f 100755
--- a/Configure
+++ b/Configure
@@ -126,7 +126,7 @@ my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-
 my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o::::::::::";
 my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::::::::";
 my $mips3_asm=":bn-mips3.o:::::::::::";
-my $s390x_asm=":bn_asm.o s390x-mont.o::aes_cbc.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::::::";
+my $s390x_asm=":bn-s390x.o::aes_cbc.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::::::";
 my $armv4_asm=":bn_asm.o armv4-mont.o::aes_cbc.o aes-armv4.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o::::::";
 my $no_asm="::::::::::::";
 
diff --git a/TABLE b/TABLE
index 3d6125d11b..e75f69f98d 100644
--- a/TABLE
+++ b/TABLE
@@ -3257,7 +3257,7 @@ $sys_id       =
 $lflags       = -ldl
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = 
-$bn_obj       = bn_asm.o s390x-mont.o
+$bn_obj       = bn-s390x.o
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-s390x.o
 $bf_obj       = 
diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 2bd9e7f4e8..2cc6fd6a05 100644
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -99,6 +99,9 @@ bn-mips3.o:	asm/mips3.s
 		as -$$ABI -O -o $@ asm/mips3.s; \
 	else	$(CC) -c $(CFLAGS) -o $@ asm/mips3.s; fi
 
+bn-s390x.o:	asm/s390x.S
+	$(CC) $(CFLAGS) -c -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