diff options
| author | Hua Zhang <hua.zhang1974@hotmail.com> | 2019-03-13 14:28:44 +0800 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-19 07:37:45 +0100 |
| commit | 0d0d12b80456c81faef31fddb9d8e2ccacc2eece (patch) | |
| tree | 62b08924fc0f9843569a5fc8adde9cca9ca3a0ff | |
| parent | 0584ce737efd26aa82d659087fc9f081ef8e30c4 (diff) | |
Fix compiling error for mips32r6 and mips64r6
There are some compiling errors for mips32r6 and mips64r6:
crypto/bn/bn-mips.S:56: Error: opcode not supported on this processor: mips2 (mips2) `mulu $1,$12,$7'
crypto/mips_arch.h: Assembler messages:
crypto/mips_arch.h:15: Error: junk at end of line, first unrecognized character is `&'
Signed-off-by: Hua Zhang <hua.zhang1974@hotmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8464)
(cherry picked from commit 1b9c5f2e2f283a3b12d02a89c11b8e8d97bc6312)
| -rw-r--r-- | crypto/bn/asm/mips.pl | 2 | ||||
| -rw-r--r-- | crypto/mips_arch.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/bn/asm/mips.pl b/crypto/bn/asm/mips.pl index 3875132bd2..8574e57b40 100644 --- a/crypto/bn/asm/mips.pl +++ b/crypto/bn/asm/mips.pl @@ -89,7 +89,7 @@ if ($flavour =~ /64|n32/i) { $SZREG=4; $REG_S="sw"; $REG_L="lw"; - $code=".set mips2\n"; + $code="#if !(defined (__mips_isa_rev) && (__mips_isa_rev >= 6))\n.set mips2\n#endif\n"; } # Below is N32/64 register layout used in the original module. diff --git a/crypto/mips_arch.h b/crypto/mips_arch.h index 75043e79d3..6145f4dc46 100644 --- a/crypto/mips_arch.h +++ b/crypto/mips_arch.h @@ -11,7 +11,7 @@ # define __MIPS_ARCH_H__ # if (defined(__mips_smartmips) || defined(_MIPS_ARCH_MIPS32R3) || \ - defined(_MIPS_ARCH_MIPS32R5) || defined(_MIPS_ARCH_MIPS32R6)) + defined(_MIPS_ARCH_MIPS32R5) || defined(_MIPS_ARCH_MIPS32R6)) \ && !defined(_MIPS_ARCH_MIPS32R2) # define _MIPS_ARCH_MIPS32R2 # endif |