From c4dded36450650f427e76fb8ef4d9747ce7d9af0 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 9 May 2024 01:25:15 +0200 Subject: [PATCH] argp: Fix test failure with clang's ASAN. Reported in . * m4/argp.m4 (gl_ARGP): Rename argp_parse to rpl_argp_parse. --- ChangeLog | 7 +++++++ m4/argp.m4 | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 61df52a712..0bb947cbcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-05-08 Bruno Haible + + argp: Fix test failure with clang's ASAN. + Reported in + . + * m4/argp.m4 (gl_ARGP): Rename argp_parse to rpl_argp_parse. + 2024-05-04 Bruno Haible readutmp, boot-time: Work around a Cygwin 3.5.3 bug. diff --git a/m4/argp.m4 b/m4/argp.m4 index 7afaa06ad6..f012fd5025 100644 --- a/m4/argp.m4 +++ b/m4/argp.m4 @@ -1,4 +1,4 @@ -# argp.m4 serial 16 +# argp.m4 serial 17 dnl Copyright (C) 2003-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,6 +10,12 @@ AC_DEFUN([gl_ARGP], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + dnl Rename argp_parse to another symbol, so that clang's ASAN does not + dnl intercept it. + dnl See . + AC_DEFINE([argp_parse], [rpl_argp_parse], + [Define to the name of argp_parse outside libc.]) + AC_CHECK_DECLS([program_invocation_name], [], [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], [1], -- 2.39.5