From 74a0cdfeff8bc2fd136d966e84f9a276c5a2f6f8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 15 Feb 2021 03:41:12 +0100 Subject: [PATCH] Fix distinction of 32-bit/64-bit mode with xlc 13.1.3 on AIX. * m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI, gl_HOST_CPU_C_ABI_32BIT): Test __LP64__ instead of _ARCH_PPC64. * m4/lib-ld.m4 (AC_LIB_PROG_LD): Likewise. * lib/stddef.in.h: Likewise. --- ChangeLog | 8 ++++++++ lib/stddef.in.h | 2 +- m4/host-cpu-c-abi.m4 | 6 +++--- m4/lib-ld.m4 | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5df08e2ab1..9b357957c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2021-02-14 Bruno Haible + + Fix distinction of 32-bit/64-bit mode with xlc 13.1.3 on AIX. + * m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI, gl_HOST_CPU_C_ABI_32BIT): + Test __LP64__ instead of _ARCH_PPC64. + * m4/lib-ld.m4 (AC_LIB_PROG_LD): Likewise. + * lib/stddef.in.h: Likewise. + 2021-02-13 Ozkan Sezer lib-symbol-visibility: Make it work with -Wmissing-prototypes. diff --git a/lib/stddef.in.h b/lib/stddef.in.h index 638589274f..ba6f90360a 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -51,7 +51,7 @@ /* On AIX 7.2, with xlc in 64-bit mode, defines max_align_t to a type with alignment 4, but 'long' has alignment 8. */ -# if defined _AIX && defined _ARCH_PPC64 +# if defined _AIX && defined __LP64__ # if !GNULIB_defined_max_align_t # ifdef _MAX_ALIGN_T /* /usr/include/stddef.h has already defined max_align_t. Override it. */ diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4 index 7dc830eff6..64e28b1d34 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 13 +# host-cpu-c-abi.m4 serial 14 dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -211,7 +211,7 @@ changequote([,])dnl # be generating 64-bit code. AC_COMPILE_IFELSE( [AC_LANG_SOURCE( - [[#if defined __powerpc64__ || defined _ARCH_PPC64 + [[#if defined __powerpc64__ || defined __LP64__ int ok; #else error fail @@ -605,7 +605,7 @@ changequote([,])dnl # be generating 64-bit code. AC_COMPILE_IFELSE( [AC_LANG_SOURCE( - [[#if defined __powerpc64__ || defined _ARCH_PPC64 + [[#if defined __powerpc64__ || defined __LP64__ int ok; #else error fail diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index aa07cb4bc6..076358d5d5 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,4 +1,4 @@ -# lib-ld.m4 serial 9 +# lib-ld.m4 serial 10 dnl Copyright (C) 1996-2003, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -122,7 +122,7 @@ else *-*-aix*) AC_COMPILE_IFELSE( [AC_LANG_SOURCE( - [[#if defined __powerpc64__ || defined _ARCH_PPC64 + [[#if defined __powerpc64__ || defined __LP64__ int ok; #else error fail -- 2.39.5