Commit 1b9c5f2e authored by Hua Zhang's avatar Hua Zhang Committed by Richard Levitte
Browse files

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: default avatarHua Zhang <hua.zhang1974@hotmail.com>

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8464)
parent 2864df8f

crypto/bn/asm/mips.pl

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,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.

crypto/mips_arch.h

+1 −1
Original line number Diff line number Diff line
@@ -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