From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25040 invoked by alias); 20 Mar 2013 23:18:00 -0000 Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org Received: (qmail 25013 invoked by uid 89); 20 Mar 2013 23:17:53 -0000 X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL,BAYES_50 autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Wed, 20 Mar 2013 23:17:50 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UISGS-0003RI-Hc from joseph_myers@mentor.com for libc-ports@sourceware.org; Wed, 20 Mar 2013 16:17:48 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 20 Mar 2013 16:17:48 -0700 Received: from digraph.polyomino.org.uk (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.1.289.1; Wed, 20 Mar 2013 23:17:46 +0000 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.76) (envelope-from ) id 1UISGP-00066u-Bd for libc-ports@sourceware.org; Wed, 20 Mar 2013 23:17:45 +0000 Date: Wed, 20 Mar 2013 23:18:00 -0000 From: "Joseph S. Myers" To: Subject: Use LIBC_CONFIG_VAR for ARM default-abi setting Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-SW-Source: 2013-03/txt/msg00152.txt.bz2 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 + + * 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 * sysdeps/arm/dl-tlsdesc.S: Include . 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