diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-03-20 23:15:42 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-03-20 23:15:42 +0000 |
| commit | d56ca734b59a76470a2f0faa61dd7fb775ce0bb0 (patch) | |
| tree | 6d26c25419f63c09f208685e403de406154dccdc | |
| parent | bef0b507497a019ae2a3f56b625e106d2b433629 (diff) | |
| download | glibc-d56ca734b59a76470a2f0faa61dd7fb775ce0bb0.tar.gz glibc-d56ca734b59a76470a2f0faa61dd7fb775ce0bb0.tar.xz glibc-d56ca734b59a76470a2f0faa61dd7fb775ce0bb0.zip | |
Use LIBC_CONFIG_VAR for ARM default-abi setting.
| -rw-r--r-- | ports/ChangeLog.arm | 8 | ||||
| -rw-r--r-- | ports/sysdeps/arm/configure | 6 | ||||
| -rw-r--r-- | ports/sysdeps/arm/configure.in | 4 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/arm/Makefile | 3 |
4 files changed, 14 insertions, 7 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 9a6ff4bc66..0156f54951 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -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> * sysdeps/arm/dl-tlsdesc.S: Include <arm-features.h>. diff --git a/ports/sysdeps/arm/configure b/ports/sysdeps/arm/configure index 91239cdf3e..b84b3f69a9 100644 --- a/ports/sysdeps/arm/configure +++ b/ports/sysdeps/arm/configure @@ -197,7 +197,9 @@ $as_echo "$libc_cv_arm_pcs_vfp" >&6; } if test $libc_cv_arm_pcs_vfp = yes; then $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 - echo "default-abi := soft" > default-abi.make + config_vars="$config_vars +default-abi = soft" fi diff --git a/ports/sysdeps/arm/configure.in b/ports/sysdeps/arm/configure.in index 6073d0ee86..d66500b3fd 100644 --- a/ports/sysdeps/arm/configure.in +++ b/ports/sysdeps/arm/configure.in @@ -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)]) if test $libc_cv_arm_pcs_vfp = yes; then AC_DEFINE(HAVE_ARM_PCS_VFP) - echo "default-abi := hard" > default-abi.make + LIBC_CONFIG_VAR([default-abi], [hard]) else - echo "default-abi := soft" > default-abi.make + LIBC_CONFIG_VAR([default-abi], [soft]) fi diff --git a/ports/sysdeps/unix/sysv/linux/arm/Makefile b/ports/sysdeps/unix/sysv/linux/arm/Makefile index 56ef159670..aa7526a258 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/Makefile +++ b/ports/sysdeps/unix/sysv/linux/arm/Makefile @@ -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 endif -# Get value of default-abi. -include $(common-objpfx)default-abi.make - abi-variants := soft hard ifeq (,$(filter $(default-abi),$(abi-variants))) |