From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 21 Mar 2013 00:41:56 +0000 (+0000)
Subject: Use LIBC_CONFIG_VAR for MIPS default-abi setting.
X-Git-Tag: glibc-2.18~486
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=defa03577f2dfeca7bc859426954a22b702ada43;p=thirdparty%2Fglibc.git

Use LIBC_CONFIG_VAR for MIPS default-abi setting.
---

diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index be2e2d50cae..539cacf19d4 100644
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,3 +1,11 @@
+2013-03-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/mips/configure.in (default-abi): Set
+	using LIBC_CONFIG_VAR.
+	* sysdeps/unix/sysv/linux/mips/configure: Regenerated.
+	* sysdeps/unix/sysv/linux/mips/Makefile: Do not include
+	default-abi.make.
+
 2013-03-15  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/mips/bits/mman.h [__USE_MISC]
diff --git a/ports/sysdeps/unix/sysv/linux/mips/Makefile b/ports/sysdeps/unix/sysv/linux/mips/Makefile
index 66ba621dae1..1e54036bfe9 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/ports/sysdeps/unix/sysv/linux/mips/Makefile
@@ -8,9 +8,6 @@ sysdep_routines += cachectl cacheflush sysmips _test_and_set
 sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h
 endif
 
-# Get value of default-abi.
-include $(common-objpfx)default-abi.make
-
 abi-variants := o32_soft o32_hard n32_soft n32_hard n64_soft n64_hard
 
 ifeq (,$(filter $(default-abi),$(abi-variants)))
diff --git a/ports/sysdeps/unix/sysv/linux/mips/configure b/ports/sysdeps/unix/sysv/linux/mips/configure
index cecfc9d84c7..b4ee83e3ae8 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/configure
+++ b/ports/sysdeps/unix/sysv/linux/mips/configure
@@ -105,7 +105,8 @@ if test -z "$libc_mips_float"; then
   as_fn_error $? "could not determine if compiler is using hard or soft floating point ABI" "$LINENO" 5
 fi
 
-echo "default-abi := ${libc_mips_abi}_${libc_mips_float}" > default-abi.make
+config_vars="$config_vars
+default-abi = ${libc_mips_abi}_${libc_mips_float}"
 
 case "$prefix" in
 /usr | /usr/)
diff --git a/ports/sysdeps/unix/sysv/linux/mips/configure.in b/ports/sysdeps/unix/sysv/linux/mips/configure.in
index 167779eaf94..b8dde6ef7a9 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/configure.in
+++ b/ports/sysdeps/unix/sysv/linux/mips/configure.in
@@ -44,7 +44,7 @@ if test -z "$libc_mips_float"; then
   AC_MSG_ERROR([could not determine if compiler is using hard or soft floating point ABI])
 fi
 
-echo "default-abi := ${libc_mips_abi}_${libc_mips_float}" > default-abi.make
+LIBC_CONFIG_VAR([default-abi], [${libc_mips_abi}_${libc_mips_float}])
 
 case "$prefix" in
 /usr | /usr/)