aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-03-21 00:41:56 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-03-21 00:41:56 +0000
commitdefa03577f2dfeca7bc859426954a22b702ada43 (patch)
tree430cf5dcc8a19bf3635203e4608c882a1f117a68
parentd56ca734b59a76470a2f0faa61dd7fb775ce0bb0 (diff)
downloadglibc-defa03577f2dfeca7bc859426954a22b702ada43.tar
glibc-defa03577f2dfeca7bc859426954a22b702ada43.tar.gz
glibc-defa03577f2dfeca7bc859426954a22b702ada43.tar.bz2
glibc-defa03577f2dfeca7bc859426954a22b702ada43.zip
Use LIBC_CONFIG_VAR for MIPS default-abi setting.
-rw-r--r--ports/ChangeLog.mips8
-rw-r--r--ports/sysdeps/unix/sysv/linux/mips/Makefile3
-rw-r--r--ports/sysdeps/unix/sysv/linux/mips/configure3
-rw-r--r--ports/sysdeps/unix/sysv/linux/mips/configure.in2
4 files changed, 11 insertions, 5 deletions
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index be2e2d50ca..539cacf19d 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 66ba621dae..1e54036bfe 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 cecfc9d84c..b4ee83e3ae 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 167779eaf9..b8dde6ef7a 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/)