From patchwork Tue May 19 17:07:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 135285 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EEA924BB3BDC for ; Tue, 19 May 2026 17:08:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EEA924BB3BDC Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=VOgE/SiN X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-vk1-xa2a.google.com (mail-vk1-xa2a.google.com [IPv6:2607:f8b0:4864:20::a2a]) by sourceware.org (Postfix) with ESMTPS id 5A1B24BA7984 for ; Tue, 19 May 2026 17:07:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5A1B24BA7984 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5A1B24BA7984 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::a2a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779210473; cv=none; b=OAii2KtQOMfQQ+qsSNVuFhFWziRH2Jvax34xe2gbU1c4YX1EQ2WV8tNmiCzCrsiK/m9Mwn+ZbWWdzW7ZeKpPMRLHoStGuAQTGQgHwgmAq2u4yxmusePZgJn1IeWexZxewBs7TUf9e44PWh6FqXIsV5ZLwjLlk5J0eFHtSdsnRTA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779210473; c=relaxed/simple; bh=ji2flgcJTgy0IgoQm+4nG8y+F1axbdX6GUi8VuOTzUk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=xZz3VB2Qp1WpwWjgOSNl9Um/owb44T58xLxXzbF7+dacZlkcmO4axVs+2xHU2xVKoUsWtIcpE2EtGYK+lwBv68jDeHVqD+Bfcg3kUcryxePOQkZgZe8iGAGXLNXSa6TDYClVXeO5I831f421kNEseNCxDpopPoFwgvzaVqJ5aUQ= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=VOgE/SiN DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5A1B24BA7984 Received: by mail-vk1-xa2a.google.com with SMTP id 71dfb90a1353d-5752b279662so1297651e0c.2 for ; Tue, 19 May 2026 10:07:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779210473; x=1779815273; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=aDo5G85vIYpKYv19LnZk7TSPR85lpJ3XbOy/1APPwgU=; b=VOgE/SiNBHA50XmMRm0gtzDPA6cgJgUpCwlRyM0GdWsD/DbhwHT08vHcyWpNyRrLzo abokFbXdp83FpiPwr+SxJSo4CkKdb0UIg08ANJXSFuimAMW8OMuy3lmHL51iOsvLlsUE EXUcXHod0XKMCQM2uGolH5crreV3YAVUiZycV0uKne193O8mt239iW60VtcfD+VJd6RY b3Etc7uIC2p5DTpazLLXJhQpywpStdEtB+W9e1ZNlZQRJhapGTjUlnZMHiq50Pw2XYQd 42lwmiudGltd2j6V38pCJVGDK23Il+o5GWg73W92+x5I39ldStJsqShoA4X+qhXwy8bz 8daA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779210473; x=1779815273; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=aDo5G85vIYpKYv19LnZk7TSPR85lpJ3XbOy/1APPwgU=; b=OruVUh8nj45k58oAQRxL8BbcijgGGwlCT5rZYxA417C4loVke5C0haHxn5p4jDkDth 4a+4qwP2XArEhxZMRZ3NSmbj4RdWgsOHAZ3mudPFsYKZR69MRC1MUqHJlAYJrL8BDEbV yjr0+okmac0X+r153+TWT8wU+31lj6a+QVarDKrAdlhHUGGgM1wU7ckoLGuvg2BU2hnf CuZDvA0ti7CQWnDmiZZvyOXt9dgYILe0NogemOT7BJ0uMW+tmMEfaQqmdaYCkGFxgysf By5KGK0QhxK0UR8QxNAn2sF0x+NXsbmzJF13wHupbv5+tG5G4sDawyj5MAtsrYz8CQXx 3Crg== X-Gm-Message-State: AOJu0YxrRhRFlfYasdSRNcA+C2yIXS5jtEE/ZlGXsr8g5k9U0J9b6TQE QsoXeGq6zA0Myi+gAjwMhgKSo41MONrg4sVonU5CErAAXlFial1TvzKDZgMDzhtT/R8LJI0TpNB 4iZZP X-Gm-Gg: Acq92OHhnHYTa/kUrj0XDAtLcNk8en+41F16le1eke7gK4OJPEIxYfbV4T/c06KUWzN 7nvQ/NjlZQuC77rkBs3ebO56u5dpBLF+3y0yKQN2b9YRzFW6Hvtwz32dvt4MDcBIuwCx9LK0QVm t6dkbOfCgHGo3nOy94+0AvG6tQhV9DmPxd8aN8CsRyKfg7kgN95FP1yrvdI8nIQE6Cj1qolam+z 4rizdurOA9uNW//VnQt3frirUvATjz5+YHD5GEIRLgkNmSoP+VBgWXDJ3XGBhZTceMkERlsDHpu L+qPTtvahYwZARbZVt9bHZ7cIJiL/QnSc6uaNS+M0WxcKMnTSGYC5vPgS8wmZRpjXMW8NPl0aUh N37J2wcGjyJGPAjNRG0emsE71eZ/qT8pzIrs60ZFnKrzSuWV6LEB85j3hol2ts6+trPxD5Jrhj7 oKc2hIrxyuhc+yXcVxINMOf7stTvkuQj+DnQE= X-Received: by 2002:a05:6122:78e:b0:575:3433:bb34 with SMTP id 71dfb90a1353d-5760c031f21mr9185286e0c.7.1779210472496; Tue, 19 May 2026 10:07:52 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c1:d905:f9d7:1c9a:81ca:c01c]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-95fc29cda8bsm7261477241.0.2026.05.19.10.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2026 10:07:51 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Paul Eggert Subject: [PATCH v2] Fix hurd bootstrap after 4c6f92daead Date: Tue, 19 May 2026 14:07:41 -0300 Message-ID: <20260519170747.2449493-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org build-many-glibc.py fails for i686-gnu with: In file included from zic.c:16: private.h:849:1: error: static declaration of ‘mempcpy’ follows non-static declaration 849 | mempcpy(void *restrict s1, void const *restrict s2, size_t n) | ^~~~~~~ In file included from ../include/string.h:60, from private.h:222: ../string/string.h:432:14: note: previous declaration of ‘mempcpy’ with type [...] 432 | extern void *mempcpy (void *__restrict __dest, | ^~~~~~~ The libc-symbols.h already defined some HAVE_*, but timezone files are built with -D_ISOMAC. Remove its usage and only define _ and N_ macros if not already defined. Checked on x86_64-linux-gnu and with a build-many-glibcs.py build for i686-gnu. --- include/libc-symbols.h | 1 + timezone/Makefile | 2 +- timezone/private.h | 16 ++++++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 67edb4965e8..6a9f6403ab9 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -113,6 +113,7 @@ #define HAVE_LIBINTL_H 1 #define HAVE_WCTYPE_H 1 #define HAVE_ISWCTYPE 1 +#define HAVE_MEMPCPY 1 #define ENABLE_NLS 1 /* The symbols in all the user (non-_) macros are C symbols. */ diff --git a/timezone/Makefile b/timezone/Makefile index 426061737a2..ce9abe6cb2d 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -67,7 +67,7 @@ tz-cflags = -DTZDIR='"$(zonedir)"' \ -DTZDEFAULT='"$(localtime-file)"' \ -DTZDEFRULES='"$(posixrules-file)"' \ -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone \ - -DHAVE_GETTEXT -DUSE_LTZ=0 -D_ISOMAC -DTZ_DOMAIN='"libc"' \ + -DHAVE_GETTEXT -DUSE_LTZ=0 -DTZ_DOMAIN='"libc"' \ -include $(common-objpfx)config.h $(config-cflags-wno-maybe-uninitialized) CFLAGS-zdump.c += $(tz-cflags) diff --git a/timezone/private.h b/timezone/private.h index ee191b4ec33..1e6db08cb32 100644 --- a/timezone/private.h +++ b/timezone/private.h @@ -1071,12 +1071,16 @@ time_t timeoff(struct tm *, long); ** The default is to use gettext if available, and use MSGID otherwise. */ -#if HAVE_GETTEXT -# define _(msgid) gettext(msgid) -#else /* !HAVE_GETTEXT */ -# define _(msgid) (msgid) -#endif /* !HAVE_GETTEXT */ -#define N_(msgid) (msgid) +#ifndef _ +# if HAVE_GETTEXT +# define _(msgid) gettext(msgid) +# else +# define _(msgid) (msgid) +# endif +#endif +#ifndef N_ +# define N_(msgid) (msgid) +#endif #if !defined TZ_DOMAIN && defined HAVE_GETTEXT # define TZ_DOMAIN "tz"