On 4/18/21 4:24 PM, Paul Eggert wrote:
Yes, they were typos that caused infloops. But little harm done; I don't think they escaped into any distributions.
Whoops, I take it back. Because those modules defined _GL_USE_STDLIB_ALLOC, stdlib.h did not define malloc and realloc and so the undefs were not needed. And as it was, realloc-gnu did not work on AIX 7.1 because the realloc replacement assumed the malloc replacement. I fixed this by installing the attached two patches. It's still a bit messy but at least it works.
>From 147828bccdcbb7af648d24ef9eaa68e9cb6b89d2 Mon Sep 17 00:00:00 2001 From: Paul Eggert <egg...@cs.ucla.edu> Date: Wed, 21 Apr 2021 11:09:01 -0700 Subject: [PATCH 1/2] malloc: simplify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lib/malloc.c: Omit unnecessary "#undef malloc". I recently introduced it by mistake. This module defines _GL_USE_STDLIB_ALLOC and so malloc isn’t redefined to rpl_malloc. --- ChangeLog | 5 +++++ lib/malloc.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e72362077..b013d915f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2021-04-21 Paul Eggert <egg...@cs.ucla.edu> + malloc: simplify + * lib/malloc.c: Omit unnecessary "#undef malloc". + I recently introduced it by mistake. This module defines + _GL_USE_STDLIB_ALLOC and so malloc isn’t redefined to rpl_malloc. + malloca: avoid ptrdiff_t overflow * lib/malloca.c: Include idx.h, intprops.h. (mmalloca): Check for ptrdiff_t overflow. Since this module uses diff --git a/lib/malloc.c b/lib/malloc.c index a900046ec..30f791fb9 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -26,9 +26,6 @@ #include "xalloc-oversized.h" -/* Call the system's malloc below. */ -# undef malloc - /* Allocate an N-byte block of memory from the heap, even if N is 0. */ void * -- 2.27.0
>From 882243dcfe41bd703db61af56e954d8dff3369ce Mon Sep 17 00:00:00 2001 From: Paul Eggert <egg...@cs.ucla.edu> Date: Wed, 21 Apr 2021 11:10:06 -0700 Subject: [PATCH 2/2] realloc: port to AIX 7.1 * lib/realloc.c (_GL_USE_STDLIB_ALLOC): Do not define. This module relies on GNU malloc. This fixes a test failure on AIX 7.1. --- ChangeLog | 4 ++++ lib/realloc.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b013d915f..579284336 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2021-04-21 Paul Eggert <egg...@cs.ucla.edu> + realloc: port to AIX 7.1 + * lib/realloc.c (_GL_USE_STDLIB_ALLOC): Do not define. This + module relies on GNU malloc. This fixes a test failure on AIX 7.1. + malloc: simplify * lib/malloc.c: Omit unnecessary "#undef malloc". I recently introduced it by mistake. This module defines diff --git a/lib/realloc.c b/lib/realloc.c index c0d94b439..0c87d0d92 100644 --- a/lib/realloc.c +++ b/lib/realloc.c @@ -18,7 +18,6 @@ /* written by Jim Meyering and Bruno Haible */ -#define _GL_USE_STDLIB_ALLOC 1 #include <config.h> #include <stdlib.h> @@ -27,7 +26,8 @@ #include "xalloc-oversized.h" -/* Call the system's realloc below. */ +/* Call the system's realloc below. This file does not define + _GL_USE_STDLIB_ALLOC because it needs Gnulib's malloc if present. */ #undef realloc /* Change the size of an allocated block of memory P to N bytes, -- 2.27.0
