summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure8
-rw-r--r--cpudetect.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index 4e44602933..9787014c25 100755
--- a/configure
+++ b/configure
@@ -1765,7 +1765,7 @@ def_fast_64bit='#define HAVE_FAST_64BIT 0'
def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0'
def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 0'
def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0'
-arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC'
+arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC'
subarch_all='X86_32 X86_64 PPC64'
case "$host_arch" in
i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
@@ -2323,9 +2323,9 @@ EOF
;;
mips)
- arch='sgi_mips'
- target_arch='ARCH_SGI_MIPS = yes'
- iproc='sgi-mips'
+ arch='mips'
+ target_arch='ARCH_MIPS = yes'
+ iproc='mips'
if irix ; then
echocheck "CPU type"
diff --git a/cpudetect.c b/cpudetect.c
index efaa88de37..c95aceea6c 100644
--- a/cpudetect.c
+++ b/cpudetect.c
@@ -535,8 +535,8 @@ if (ARCH_PPC)
if (ARCH_ALPHA)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: Digital Alpha\n");
-if (ARCH_SGI_MIPS)
- mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: SGI MIPS\n");
+if (ARCH_MIPS)
+ mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: MIPS\n");
if (ARCH_PA_RISC)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: Hewlett-Packard PA-RISC\n");