From d4b836cb1d19499222e03a2fcf5cce3d83faf4a4 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 f61d05a90f..5166fe99de 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-08 Bruno Haible gnulib-tool.py: Make --megatest behaviour more similar to shell impl. diff --git a/m4/argp.m4 b/m4/argp.m4 index 3df651b270..a093c4d745 100644 --- a/m4/argp.m4 +++ b/m4/argp.m4 @@ -1,5 +1,5 @@ # argp.m4 -# serial 16 +# 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, @@ -11,6 +11,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