mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

mips: fix testsuite build for O32 FPXX ABI on pre-R2 CPU

Browse Source 
On MIPS when the toolchain is using the O32 FPXX ABI, the testsuite
fails to build for pre-R2 CPU.

It assumes that it is possible to use the -mfp64 option to build
tst-abi-fp64amod and tst-abi-fp64mod, while this requires a CPU which
supports the mfhc1 and mthc1 instructions, ie at least a R2 CPU:

  error: '-mgp32' and '-mfp64' can only be combined if the target
  supports the mfhc1 and mthc1 instructions

The same way it assumes that it is possible to use the -modd-spreg option
to build tst-abi-fpxxomod and tst-abi-fp64mod, while this requires at
least a R1 CPU:

  warning: the 'mips2' architecture does not support odd
  single-precision registers

This patches changes that by checking the usability of -mfp64 and
-modd-spreg options in configure, and disable those tests when they can
not be used.
This commit is contained in:
Aurelien Jarno 2015-12-07 23:07:17 +01:00
parent 3b51c390f7
commit 578d080544
4 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2015-12-09 Aurelien Jarno <aurelien@aurel32.net>
* sysdeps/unix/sysv/linux/mips/configure.ac (has-mpf64): Define to
record the current if the current ABI and CPU support the FP64
extension.
(has-modd-spreg): Define to record the current if the current ABI and
CPU support 32-bit floating point values in odd FPU registers.
* sysdeps/unix/sysv/linux/mips/configure: Regenerate.
* sysdeps/mips/Makefile (tst-abi-fpxxomod): Only build when
$(has-modd-spreg) equals yes.
(tst-abi-fp64amod): Only build when $(has-mpf64) equals yes.
(tst-abi-fp64mod): Only build when both $(has-mpf64) and
$(has-modd-spreg) equal yes.
2015-12-09 Aurelien Jarno <aurelien@aurel32.net>
* sysdeps/unix/grantpt.c (grantpt): Call__basename instead of

6
sysdeps/mips/Makefile
View File

@ -42,17 +42,23 @@ fpabi-modules-names += tst-abi-fpxxmod
CFLAGS-tst-abi-fpxxmod.c += -mfpxx -mno-odd-spreg
endif
ifneq (,$(filter $(o32-fpabi),xx xxo))
ifeq ($(has-modd-spreg),yes)
fpabi-modules-names += tst-abi-fpxxomod
CFLAGS-tst-abi-fpxxomod.c += -mfpxx -modd-spreg
endif
endif
ifneq (,$(filter $(o32-fpabi),xx 64a))
ifeq ($(has-mpf64),yes)
fpabi-modules-names += tst-abi-fp64amod
CFLAGS-tst-abi-fp64amod.c += -mfp64 -mno-odd-spreg
endif
endif
ifneq (,$(filter $(o32-fpabi),xx xxo 64a 64))
ifeq ($(has-mpf64)-$(has-modd-spreg),yes-yes)
fpabi-modules-names += tst-abi-fp64mod
CFLAGS-tst-abi-fp64mod.c += -mfp64 -modd-spreg
endif
endif
modules-names += $(fpabi-modules-names)
comma:=,

27
sysdeps/unix/sysv/linux/mips/configure vendored
View File

@ -106,6 +106,8 @@ if test -z "$libc_mips_float"; then
fi
libc_mips_o32_fp=
libc_cv_mips_fp64=
libc_cv_mips_modd_spreg=
if test x"$libc_mips_abi" = xo32 -a x"$libc_mips_float" = xhard; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@ -219,9 +221,34 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if { ac_try='${CC-cc} -mfp64 -xc /dev/null -S -o /dev/null'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }; then :
libc_cv_mips_fp64=yes
else
libc_cv_mips_fp64=no
fi
if { ac_try='${CC-cc} -Werror -modd-spreg -xc /dev/null -S -o /dev/null'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }; then :
libc_cv_mips_modd_spreg=yes
else
libc_cv_mips_modd_spreg=no
fi
fi
config_vars="$config_vars
o32-fpabi = ${libc_mips_o32_fp}"
config_vars="$config_vars
has-mpf64 = ${libc_cv_mips_fp64}"
config_vars="$config_vars
has-modd-spreg = ${libc_cv_mips_modd_spreg}"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

7
sysdeps/unix/sysv/linux/mips/configure.ac
View File

@ -45,6 +45,8 @@ if test -z "$libc_mips_float"; then
fi
libc_mips_o32_fp=
libc_cv_mips_fp64=
libc_cv_mips_modd_spreg=
if test x"$libc_mips_abi" = xo32 -a x"$libc_mips_float" = xhard; then
AC_COMPILE_IFELSE(
@ -84,8 +86,13 @@ if test x"$libc_mips_abi" = xo32 -a x"$libc_mips_float" = xhard; then
[libc_mips_o32_fp=64],
[])])])])])],
[])
LIBC_TRY_CC_OPTION([-mfp64], [libc_cv_mips_fp64=yes], [libc_cv_mips_fp64=no])
LIBC_TRY_CC_OPTION([-Werror -modd-spreg], [libc_cv_mips_modd_spreg=yes], [libc_cv_mips_modd_spreg=no])
fi
LIBC_CONFIG_VAR([o32-fpabi],[${libc_mips_o32_fp}])
LIBC_CONFIG_VAR([has-mpf64],[${libc_cv_mips_fp64}])
LIBC_CONFIG_VAR([has-modd-spreg],[${libc_cv_mips_modd_spreg}])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([