Fix irix-cc build.

Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit e464403d0bda2f1f74eb68582e4988e591c32433)

diff --git a/crypto/aes/asm/aes-mips.pl b/crypto/aes/asm/aes-mips.pl
index 1fdc6bf85c95aa7474579f4db4d560389fb27c1a..4de3ee26bb74cf9a53d8dcd714b08b0af543cb39 100644 (file)
--- a/crypto/aes/asm/aes-mips.pl
+++ b/crypto/aes/asm/aes-mips.pl
@@ -79,7 +79,7 @@ $pf = ($flavour =~ /nubi/i) ? $t0 : $t2;
 #
 ######################################################################
 
-$big_endian=(`echo MIPSEL | $ENV{CC} -E -P -`=~/MIPSEL/)?1:0;
+$big_endian=(`echo MIPSEL | $ENV{CC} -E -`=~/MIPSEL/)?1:0 if ($ENV{CC});
 
 for (@ARGV) {  $output=$_ if (/^\w[\w\-]*\.\w+$/);     }
 open STDOUT,">$output";

diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c
index dbdd0b9ba63e4c47b4aab15afd40d105e2e10d6e..cabc7a1260cf3b9fd75d990d728811ac1928998c 100644 (file)
--- a/crypto/dh/dh_kdf.c
+++ b/crypto/dh/dh_kdf.c
@@ -131,7 +131,7 @@ static int dh_sharedinfo_encode(unsigned char **pder, unsigned char **pctr,
                return 0;
        if (!skip_asn1(&p, &tlen, V_ASN1_OCTET_STRING))
                return 0;
-       if (memcmp(p, ctr, 4))
+       if (CRYPTO_memcmp(p, ctr, 4))
                return 0;
        *pctr = p;
        return derlen;

diff --git a/crypto/sha/asm/sha1-mips.pl b/crypto/sha/asm/sha1-mips.pl
index 73bf0609b48c376b621a6e3fdfeaaea2e99de757..340849389993372e29a7a68f9bcb335d4e1014c9 100644 (file)
--- a/crypto/sha/asm/sha1-mips.pl
+++ b/crypto/sha/asm/sha1-mips.pl
@@ -68,7 +68,7 @@ if ($flavour =~ /64|n32/i) {
 #
 ######################################################################
 
-$big_endian=(`echo MIPSEL | $ENV{CC} -E -P -`=~/MIPSEL/)?1:0;
+$big_endian=(`echo MIPSEL | $ENV{CC} -E -`=~/MIPSEL/)?1:0 if ($ENV{CC});
 
 for (@ARGV) {  $output=$_ if (/^\w[\w\-]*\.\w+$/);   }
 open STDOUT,">$output";

diff --git a/crypto/sha/asm/sha512-mips.pl b/crypto/sha/asm/sha512-mips.pl
index 89623098d7ac3826528745a24254222edca9eea6..b468cfb4569e963f77fee03959dddff7b2077c6b 100644 (file)
--- a/crypto/sha/asm/sha512-mips.pl
+++ b/crypto/sha/asm/sha512-mips.pl
@@ -72,7 +72,7 @@ $pf = ($flavour =~ /nubi/i) ? $t0 : $t2;
 #
 ######################################################################
 
-$big_endian=(`echo MIPSEL | $ENV{CC} -E -P -`=~/MIPSEL/)?1:0;
+$big_endian=(`echo MIPSEL | $ENV{CC} -E -`=~/MIPSEL/)?1:0 if ($ENV{CC});
 
 for (@ARGV) {  $output=$_ if (/^\w[\w\-]*\.\w+$/);     }
 open STDOUT,">$output";