summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2017-08-20 01:19:50 +0200
committerBruno Haible <bruno@clisp.org>2017-08-20 01:19:50 +0200
commitec2d7255807370edb0c8f429c21b9dee566410a8 (patch)
tree6341e8bfc65995a408b51c2b47a192c883280a38
parent5408b0e0cd0396ea49aa20907c63568ee9b38688 (diff)
downloadgnulib-ec2d7255807370edb0c8f429c21b9dee566410a8.tar.gz
host-cpu-c-abi: Improve detection of MIPS ABI.
* m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI): For MIPS, test the value of _MIPS_SIM.
-rw-r--r--ChangeLog6
-rw-r--r--m4/host-cpu-c-abi.m412
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 916d63b481..eb71b1ad6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-19 Bruno Haible <bruno@clisp.org>
+
+ host-cpu-c-abi: Improve detection of MIPS ABI.
+ * m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI): For MIPS, test the value of
+ _MIPS_SIM.
+
2017-08-17 Bruno Haible <bruno@clisp.org>
hypot tests: Fix test failure on FreeBSD 11.0/x86.
diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4
index 01c5a666da..02f7b8a7d4 100644
--- a/m4/host-cpu-c-abi.m4
+++ b/m4/host-cpu-c-abi.m4
@@ -1,4 +1,4 @@
-# host-cpu-c-abi.m4 serial 6
+# host-cpu-c-abi.m4 serial 7
dnl Copyright (C) 2002-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -157,12 +157,12 @@ changequote([,])dnl
yes
#endif],
[gl_cv_host_cpu_c_abi=mips64],
- [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined, and
- # _MIPS_SIM == _ABIN32.
- # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined, and
- # _MIPS_SIM == _ABIO32.
+ [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but
+ # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIN32.
+ # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but
+ # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIO32.
AC_EGREP_CPP([yes],
- [#if defined _ABIN32
+ [#if (_MIPS_SIM == _ABIN32)
yes
#endif],
[gl_cv_host_cpu_c_abi=mipsn32],