Put mips preconfigure code inside mips* case statement.

Fix capitalization of error message.

diff --git a/ChangeLog b/ChangeLog
index 100e923936cc776db1136af7718dbef4a2f3f407..63efb00b7744c9b8b720b3425259fe11d3132b28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-09  Steve Ellcey  <sellcey@mips.com>
+
+       * sysdeps/mips/preconfigure: Put code inside mips* case statement.
+       Fix capitalization of error message.
+
 2014-09-09  Steve Ellcey  <sellcey@mips.com>
 
        * sysdeps/mips/preconfigure: Modify ABI tests.

diff --git a/sysdeps/mips/preconfigure b/sysdeps/mips/preconfigure
index fb572d752ffc6344bf587d941f033191c9fef87c..c118592b272ffba0f67917534a5ff6d1a0803105 100644 (file)
--- a/sysdeps/mips/preconfigure
+++ b/sysdeps/mips/preconfigure
@@ -1,24 +1,29 @@
-abiflag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | sed -n 's/^#define _MIPS_SIM \(.*\)/\1/p'`
-mips16flag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | sed -n 's/^#define __mips16 \(.*\)/\1/p'`
+case "$machine" in
+mips*)
+       abiflag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | sed -n 's/^#define _MIPS_SIM \(.*\)/\1/p'`
+       mips16flag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | sed -n 's/^#define __mips16 \(.*\)/\1/p'`
 
-base_machine=mips
-if test "$abiflag" = "_ABIO32" ; then
-       if test "$mips16flag" = "1" ; then
-               machine=mips/mips32/mips16
+       base_machine=mips
+       if test "$abiflag" = "_ABIO32" ; then
+               if test "$mips16flag" = "1" ; then
+                       machine=mips/mips32/mips16
+               else
+                       machine=mips/mips32
+               fi
+       elif test "$abiflag" = "_ABIN32" ; then
+               machine=mips/mips64/n32
+       elif test "$abiflag" = "_ABI64" ; then
+               machine=mips/mips64/n64
        else
-               machine=mips/mips32
+               as_fn_error $? "Unable to determine ABI." "$LINENO" 5
        fi
-elif test "$abiflag" = "_ABIN32" ; then
-       machine=mips/mips64/n32
-elif test "$abiflag" = "_ABI64" ; then
-       machine=mips/mips64/n64
-else
-       as_fn_error $? "Unable to determine ABI." "$LINENO" 5
-fi
-# $config_machine is not really needed here but the slash after $machine is
-# needed by the case statement in sysdeps/unix/sysv/linux/mips/configure.ac.
-machine=$machine/$config_machine
+       # $config_machine is not really needed here but the slash after
+       # $machine is needed by the case statement in
+       # sysdeps/unix/sysv/linux/mips/configure.ac.
+       machine=$machine/$config_machine
 
-if test "$abiflag" != "_ABIO32" -a "$mips16flag" = "1"; then
-       as_fn_error $? "mips16 is only supported with the O32 ABI." "$LINENO" 5
-fi
+       if test "$abiflag" != "_ABIO32" -a "$mips16flag" = "1"; then
+               as_fn_error $? "MIPS16 is only supported with the o32 ABI." "$LINENO" 5
+       fi
+       ;;
+esac