Use LIBC_CONFIG_VAR for ARM default-abi setting.

This commit is contained in:
Joseph Myers 2013-03-20 23:15:42 +00:00
parent bef0b50749
commit d56ca734b5
4 changed files with 14 additions and 7 deletions

View File

@ -1,3 +1,11 @@
2013-03-20 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/configure.in (default-abi): Set using
LIBC_CONFIG_VAR.
* sysdeps/arm/configure: Regenerated.
* sysdeps/unix/sysv/linux/arm/Makefile: Do not include
default-abi.make.
2013-03-18 Roland McGrath <roland@hack.frob.com> 2013-03-18 Roland McGrath <roland@hack.frob.com>
* sysdeps/arm/dl-tlsdesc.S: Include <arm-features.h>. * sysdeps/arm/dl-tlsdesc.S: Include <arm-features.h>.

View File

@ -197,7 +197,9 @@ $as_echo "$libc_cv_arm_pcs_vfp" >&6; }
if test $libc_cv_arm_pcs_vfp = yes; then if test $libc_cv_arm_pcs_vfp = yes; then
$as_echo "#define HAVE_ARM_PCS_VFP 1" >>confdefs.h $as_echo "#define HAVE_ARM_PCS_VFP 1" >>confdefs.h
echo "default-abi := hard" > default-abi.make config_vars="$config_vars
default-abi = hard"
else else
echo "default-abi := soft" > default-abi.make config_vars="$config_vars
default-abi = soft"
fi fi

View File

@ -40,7 +40,7 @@ AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI],
], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)]) ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)])
if test $libc_cv_arm_pcs_vfp = yes; then if test $libc_cv_arm_pcs_vfp = yes; then
AC_DEFINE(HAVE_ARM_PCS_VFP) AC_DEFINE(HAVE_ARM_PCS_VFP)
echo "default-abi := hard" > default-abi.make LIBC_CONFIG_VAR([default-abi], [hard])
else else
echo "default-abi := soft" > default-abi.make LIBC_CONFIG_VAR([default-abi], [soft])
fi fi

View File

@ -70,9 +70,6 @@ LDFLAGS-tst-rfc3484-2 += $(common-objpfx)csu/libc-do-syscall.o
LDFLAGS-tst-rfc3484-3 += $(common-objpfx)csu/libc-do-syscall.o LDFLAGS-tst-rfc3484-3 += $(common-objpfx)csu/libc-do-syscall.o
endif endif
# Get value of default-abi.
include $(common-objpfx)default-abi.make
abi-variants := soft hard abi-variants := soft hard
ifeq (,$(filter $(default-abi),$(abi-variants))) ifeq (,$(filter $(default-abi),$(abi-variants)))