Also, switch from eealloc.m4 to malloc.m4 to determine
whether malloc (0) returns nonnull.
* lib/malloca.c (mmalloca): Use HAVE_MALLOC_0_NONNULL,
not MALLOC_0_IS_NONNULL.
* m4/malloca.m4 (gl_MALLOCA): Require gl_FUNC_MALLOC_GNU,
not gl_EEMALLOC.
* modules/malloca (Files): Remove m4/eemalloc.m4.
(Depends-on): Add extensions-aix.
* modules/relocatable-prog-wrapper:
AC_REQUIRE gl_FUNC_MALLOC_POSIX to suppress Autoconf 2.71
“warning: AC_REQUIRE: `gl_FUNC_MALLOC_POSIX' was expanded before
it was required”.
---
ChangeLog | 14 ++++++++++++++
lib/malloca.c | 2 +-
m4/malloca.m4 | 4 ++--
modules/malloca | 2 +-
modules/relocatable-prog-wrapper | 2 +-
5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 16b28b3f65..6c316acf90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2024-11-05 Paul Eggert <egg...@cs.ucla.edu>
+ malloca: port better to AIX extensions
+ Also, switch from eealloc.m4 to malloc.m4 to determine
+ whether malloc (0) returns nonnull.
+ * lib/malloca.c (mmalloca): Use HAVE_MALLOC_0_NONNULL,
+ not MALLOC_0_IS_NONNULL.
+ * m4/malloca.m4 (gl_MALLOCA): Require gl_FUNC_MALLOC_GNU,
+ not gl_EEMALLOC.
+ * modules/malloca (Files): Remove m4/eemalloc.m4.
+ (Depends-on): Add extensions-aix.
+ * modules/relocatable-prog-wrapper:
+ AC_REQUIRE gl_FUNC_MALLOC_POSIX to suppress Autoconf 2.71
+ “warning: AC_REQUIRE: `gl_FUNC_MALLOC_POSIX' was expanded before
+ it was required”.
+
malloc: refactor to help replace eealloc
* m4/malloc.m4 (gl_FUNC_MALLOC_0_NONNULL):
New macro, split out from gl_FUNC_MALLOC_GNU.
diff --git a/lib/malloca.c b/lib/malloca.c
index e75c72df84..520f34d280 100644
--- a/lib/malloca.c
+++ b/lib/malloca.c
@@ -93,7 +93,7 @@ mmalloca (size_t n)
/* Out of memory. */
return NULL;
#else
-# if !MALLOC_0_IS_NONNULL
+# if !HAVE_MALLOC_0_NONNULL
if (n == 0)
n = 1;
# endif
diff --git a/m4/malloca.m4 b/m4/malloca.m4
index 0929b9efff..8d80e38055 100644
--- a/m4/malloca.m4
+++ b/m4/malloca.m4
@@ -1,5 +1,5 @@
# malloca.m4
-# serial 2
+# serial 3
dnl Copyright (C) 2003-2004, 2006-2007, 2009-2024 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -12,5 +12,5 @@ AC_DEFUN([gl_MALLOCA],
dnl Use the autoconf tests for alloca(), but not the AC_SUBSTed variables
dnl @ALLOCA@ and @LTALLOCA@.
dnl gl_FUNC_ALLOCA dnl Already brought in by the module dependencies.
- AC_REQUIRE([gl_EEMALLOC])
+ AC_REQUIRE([gl_FUNC_MALLOC_GNU])
])
diff --git a/modules/malloca b/modules/malloca
index ffa5306a0b..1eb235fe1b 100644
--- a/modules/malloca
+++ b/modules/malloca
@@ -5,12 +5,12 @@ Files:
lib/malloca.h
lib/malloca.c
m4/malloca.m4
-m4/eealloc.m4
m4/malloc.m4
Depends-on:
alloca-opt
assert-h
+extensions-aix
idx
stdckdint
stdint
diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index 4d8e70d3ac..e40ce3b873 100644
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -85,7 +85,7 @@ configure.ac:
AC_REQUIRE([AC_C_RESTRICT])
gl_FUNC_READLINK_SEPARATE
gl_CANONICALIZE_LGPL_SEPARATE
-gl_FUNC_MALLOC_POSIX
+AC_REQUIRE([gl_FUNC_MALLOC_POSIX])
gl_FUNC_REALLOC_POSIX
gl_FUNC_FREE
gl_FUNC_MEMPCPY
--
2.43.0
