Put mips preconfigure code inside mips* case statement.

Fix capitalization of error message.
This commit is contained in:
Steve Ellcey 2014-09-09 10:58:00 -07:00
parent 0febba23dd
commit 9d3a350b49
2 changed files with 30 additions and 20 deletions

View File

@ -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.

View File

@ -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