From patchwork Wed May 20 11:47:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 135330 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 6DA8D4BB5922 for ; Wed, 20 May 2026 11:48:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6DA8D4BB5922 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=EpdXFW7l X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x934.google.com (mail-ua1-x934.google.com [IPv6:2607:f8b0:4864:20::934]) by sourceware.org (Postfix) with ESMTPS id BA1FB4BB3B88 for ; Wed, 20 May 2026 11:47:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BA1FB4BB3B88 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 BA1FB4BB3B88 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::934 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779277654; cv=none; b=DUoaT9UZ0tCSzgX4sb47Lw7AisPZaa8mi1QYNTRTpvBb3wUygce84eJQ6GQb/+X+Iug2NG3zSVUKfFTJboVAOIKOSdV8guFdA12H+W2tpoeE/dsGJVtH6HRwYMKOsmEnKKi9Pl63Rj5DFORBQeEFqoUfx23a5T28m8HYM8q1HXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779277654; c=relaxed/simple; bh=A2uIPTofl6mo4UUsUv27UC6xaRuswFbRSEGW3XvBUuk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=V6WUiSM9/xGJXgfnb8zlOsgEuYcysR4xN3UeyMQAfujjiF0wXv9q481XBU7WfB0nUmZUUz4yJIJiAMqhd8VTFS+fxW/ORsA0lr5lSegjShT4E6bE/vRZ3KOxsKB1cEjAA1gTlOIjv98rkQoZtrhRvIcKgMKXpnYSSL0MbKE4dBc= 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=EpdXFW7l DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BA1FB4BB3B88 Received: by mail-ua1-x934.google.com with SMTP id a1e0cc1a2514c-95cc8ac98bfso795329241.3 for ; Wed, 20 May 2026 04:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779277654; x=1779882454; 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=gLlkBQNPBXnolczKvYqJ7FKwzmnyCi1APRdqnpVllF0=; b=EpdXFW7lqlQVhslDnmqc2/oNbnrIXvfm23wHxBEnJTQV0JhBvKNLz5npHL0PRcnb/8 E8P1qpKja8p0xUTGraXwUlGTiNf1OTUaI3UYjh44ndoqUtIs3MwEJl3gFY9r5ADIefNg iBMYeolpZtTo7QLrut2AFB5aL/B1Bv9b+xCIdLYDdOFsPIEEjolCryeWGNHQ/SwBV8hr aucPJMRdQ4MkKJiuWeqYZRgRZf7F7+xUlmfAWhCjQBpoHcAZfYJ/WR+KI9WE25/YsFoa 8VY28mTwK9UE29v5tWfvqyFDZpsdgaXUwXQLNFthoek0Q5YI42/ThEz8Mqz36nqoTqOS LTYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779277654; x=1779882454; 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=gLlkBQNPBXnolczKvYqJ7FKwzmnyCi1APRdqnpVllF0=; b=Xak0XYrC60+EFo/cOCwNoPDQ+tgNMlI/EAJMvV+n3eO1+7oDuWgHoEk2f0/g/lK/iA 3rbeI20U4oEqqWPg0dALZi2ORkiDmzBclH92wPze3B9AVqlmHWcXq03e+tewLPB3IAcg fobiWaVXmhdpR/uRzIIpvLEWRLZ0THYJkhfn3KBurNUyQkcteX34Kw4jVIEoaIU7UZdf IsTihtLiSNXHDRAkTDMjiTHE6LC5mCenPCAWK7/k0/R2VK2jAqaF4x3GZuVdN55Ikv3X O5ncygVQlJz9rOPR++Uy/6D/x7/rYn2jaxksDhB58dnYqkuSKGF4MOQDgUunAT1tBkYp HDaA== X-Gm-Message-State: AOJu0YwmlG3p/d5rwcRnko9HTMqBNRRvLBsnNVA1pVFhFCeehwoNUkU0 e/teMHEhPC6DrbBpzZKb0Mg+2ZIenKHK+GdJVTAbUvK+XyVBDliZgVoJ2XTqLm6qnF60n0TVnS8 yw7Ia X-Gm-Gg: Acq92OE4EThqU097hWoIkAphUHL1Y/URm/ar1dmjQT30D0V6mnF4M49JQxXpQS7V6X6 b/3PvEkf4XZ5UMK6v9wkdBj7aS74RoXHMmKwQ8BPLwG09ivbEWTCmVeLly6sTEfYVuY3jmzQqGm ebKrb3dkoXK0156ksJrX+YdJYob6JzWVG28ExAxLsbFWan5xGMIvtcyPqHHKxZtCvM6kup2xmBf 5rUQgjkYf9l1X4dgc0EOzuw+Qn7z1ifBtEpDBii4hOdFjrB5xNK0+OsyAo6+3dThHIdBHYj464S P7/lzjwPSZ/+pGCnjzwuZvEtPhjfP6AFU6JqT4BCTzWkNzPZxyo5qivyLAr08QGdg7fejkfSIzV UyVVXkewWdhTqoCk5iNqSBjIkwL6QFeSdVQJZ1cQAI5UGsnvGmiBmgsBZqqN7G0btQfYBu3Ugeh HKkTuA14Qr+FK3FeVqDivvnre1aSRmXlAh3R0= X-Received: by 2002:a05:6102:50a9:b0:634:16ce:aa3b with SMTP id ada2fe7eead31-63a3ec841f3mr10651936137.15.1779277654145; Wed, 20 May 2026 04:47:34 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c1:d905:fd82:5d3f:8372:aad6]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-95fc2c9a4f8sm8277675241.2.2026.05.20.04.47.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 04:47:32 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Paul Eggert , "H . J . Lu" Subject: [PATCH v3] Fix hurd bootstrap after 4c6f92daead Date: Wed, 20 May 2026 08:47:25 -0300 Message-ID: <20260520114727.2166484-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 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 Hurd bootstrap with build-many-glibc.py fails for i686-gnu since 4c6f92daead7aa989ae1b7c67760f81a3550f044: 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"