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)
This commit is contained in:
Hua Zhang 2019-03-13 14:28:44 +08:00 committed by Richard Levitte
parent 2864df8f9d
commit 1b9c5f2e2f
2 changed files with 2 additions and 2 deletions

View File

@ -88,7 +88,7 @@ if ($flavour =~ /64|n32/i) {
$SZREG=4; $SZREG=4;
$REG_S="sw"; $REG_S="sw";
$REG_L="lw"; $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. # Below is N32/64 register layout used in the original module.

View File

@ -11,7 +11,7 @@
# define __MIPS_ARCH_H__ # define __MIPS_ARCH_H__
# if (defined(__mips_smartmips) || defined(_MIPS_ARCH_MIPS32R3) || \ # 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) && !defined(_MIPS_ARCH_MIPS32R2)
# define _MIPS_ARCH_MIPS32R2 # define _MIPS_ARCH_MIPS32R2
# endif # endif