diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/mips/preconfigure | 45 |
2 files changed, 30 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog index 100e923936..63efb00b77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 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. 2014-09-07 Carlos O'Donell <carlos@systemhalted.org> diff --git a/sysdeps/mips/preconfigure b/sysdeps/mips/preconfigure index fb572d752f..c118592b27 100644 --- 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 |