summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2012-08-17 09:38:45 +0000
committerAndy Polyakov <appro@openssl.org>2012-08-17 09:38:45 +0000
commit9a10ea3fc05ec0648670ef0111ed5777a32391de (patch)
tree40dde602186d873d0ecab2d122f4ff6f11ed1f7d
parent1a002d88adfff6d4e26789fff6a52c22cd525126 (diff)
downloadopenssl-new-9a10ea3fc05ec0648670ef0111ed5777a32391de.tar.gz
Configure: add mips-mont to MIPS32 builds.
-rwxr-xr-xConfigure2
-rw-r--r--TABLE6
2 files changed, 4 insertions, 4 deletions
diff --git a/Configure b/Configure
index 8f0a0c225e..a4284b3160 100755
--- a/Configure
+++ b/Configure
@@ -133,8 +133,8 @@ my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o
my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o::void";
my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void";
my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void";
-my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::";
my $mips64_asm=":bn-mips.o mips-mont.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::";
+my $mips32_asm=$mips64_asm; $mips32_asm =~ s/\s*sha512\-mips\.o//;
my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o s390x-gf2m.o::aes-s390x.o aes-ctr.o aes-xts.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::ghash-s390x.o:";
my $armv4_asm="armcap.o armv4cpuid.o:bn_asm.o armv4-mont.o armv4-gf2m.o::aes_cbc.o aes-armv4.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::ghash-armv4.o::void";
my $parisc11_asm="pariscid.o:bn_asm.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::32";
diff --git a/TABLE b/TABLE
index e98728b6f4..83d6bed824 100644
--- a/TABLE
+++ b/TABLE
@@ -3540,7 +3540,7 @@ $sys_id =
$lflags =
$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR
$cpuid_obj =
-$bn_obj = bn-mips.o
+$bn_obj = bn-mips.o mips-mont.o
$des_obj =
$aes_obj = aes_cbc.o aes-mips.o
$bf_obj =
@@ -3573,7 +3573,7 @@ $sys_id =
$lflags =
$bn_ops = BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR
$cpuid_obj =
-$bn_obj = bn-mips.o
+$bn_obj = bn-mips.o mips-mont.o
$des_obj =
$aes_obj = aes_cbc.o aes-mips.o
$bf_obj =
@@ -5949,7 +5949,7 @@ $sys_id = VXWORKS
$lflags = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon
$bn_ops =
$cpuid_obj =
-$bn_obj = bn-mips.o
+$bn_obj = bn-mips.o mips-mont.o
$des_obj =
$aes_obj = aes_cbc.o aes-mips.o
$bf_obj =