This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
Use LIBC_CONFIG_VAR for ARM default-abi setting
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: <libc-ports at sourceware dot org>
- Date: Wed, 20 Mar 2013 23:17:45 +0000
- Subject: Use LIBC_CONFIG_VAR for ARM default-abi setting
I've applied this patch to make ARM use the new LIBC_CONFIG_VAR autoconf
macro to set default-abi, instead of creating a file default-abi.make.
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 9a6ff4b..0156f54 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 91239cd..b84b3f6 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 6073d0e..d66500b 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 56ef159..aa7526a 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)))
--
Joseph S. Myers
joseph@codesourcery.com