From 10ccf9015ed8c932dc3bbb82fe32d2db28bf45d9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 19 Jul 2017 02:35:23 +0200 Subject: [PATCH] host-cpu-c-abi: Fix detection of MIPS ABI. * m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI): For MIPS, really test the ABI, not the CPU instruction set. --- ChangeLog | 6 ++++++ m4/host-cpu-c-abi.m4 | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2e140f0f0..2a59e49070 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-07-18 Bruno Haible + + host-cpu-c-abi: Fix detection of MIPS ABI. + * m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI): For MIPS, really test the + ABI, not the CPU instruction set. + 2017-07-16 Paul Eggert explicit_bzero: new module diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4 index a3a3d431a4..3017f6c891 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 4 +# host-cpu-c-abi.m4 serial 5 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, @@ -146,12 +146,12 @@ changequote([,])dnl yes #endif], [gl_cv_host_cpu_c_abi=mips64], - [# Strictly speaking, the MIPS ABI (-32 or -n32) is independent - # from the CPU identification (-mips[12] or -mips[34]). But -n32 - # is commonly used together with -mips3, and it's easier to test - # the CPU identification. + [# 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. AC_EGREP_CPP([yes], - [#if __mips >= 3 + [#if defined _ABIN32 yes #endif], [gl_cv_host_cpu_c_abi=mipsn32], -- 2.11.4.GIT