From patchwork Tue May 19 14:54:06 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 135281 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 9E2584BB3BA8 for ; Tue, 19 May 2026 14:55:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9E2584BB3BA8 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=MFHiiM7C X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-vk1-xa36.google.com (mail-vk1-xa36.google.com [IPv6:2607:f8b0:4864:20::a36]) by sourceware.org (Postfix) with ESMTPS id 06F024BA2E05 for ; Tue, 19 May 2026 14:54:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 06F024BA2E05 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 06F024BA2E05 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::a36 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779202474; cv=none; b=CgmZ4JEpHVFcDiYXLyeMe8kxqcpH1MSxAlH51zGCbJxv/2jrKXEdo3yxxg/U9+nfJOSxaIUHJ+KAJE1g9ozYFPW0DZSo6MqHaN5vUjg07RNZHdp8zo+Y/P+bx/mQ19EMbJOjA4v2HZhnp/821pg86qO32jmncEwkMtKxoKVwbog= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779202474; c=relaxed/simple; bh=Fe+VTVkJhnvL8ZCpsO41jh9wU4YK8wSPA4guB1I0OF8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=XT/0gNEToCYl0go3ZOaSkmHCBYJeltBPb+uWivj9GhP7Q0ApENZEcMxh45HhZgXdOUygfkd3J8IDX15JMZpewRtKjJ5yQSv/3MB0grN/OKrSTUS6RNrSpg1WTIQElLccEu770NUCaEioi4PTof/eAlaqGCPiQtWp5HXcnG18n5Q= 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=MFHiiM7C DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 06F024BA2E05 Received: by mail-vk1-xa36.google.com with SMTP id 71dfb90a1353d-5780c38ecb8so2109763e0c.2 for ; Tue, 19 May 2026 07:54:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202473; x=1779807273; 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=5na76zCcs8Bnv00Vj/7rRWTMvrrj2ZqG8QWUk4kO/CU=; b=MFHiiM7CpkS5fZ9+0x4tzT5XwOSFQzSDCQk5U+3vXtbG+bzOJXeW9hXphwvt9veBU/ 9r+vZQzchEo9yQQjo4WTtf2f3TjoNhOfdTLlA0TwcS7l+jF7OO1OPnIkxuo17F0/TijM hCEPdjRd0aS0ZHXgeyw0hcEWlYzb/ifynXS8TYtYb/aC8+BRgz0YmsoPba2J1JGgxSSk DjWiONcpHM7HR5TUG5ZXam7oz3KHFK1HUI5ULxQkbXQmYxYcXpCl2y8qwapteKxR5pMP xDgpAJXWZAV8cN4CM4E5iu3M1m5LVYQui6yWfhIjon4Fsa27xs7TlOL++vb1+t1NAwFa SS0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202473; x=1779807273; 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=5na76zCcs8Bnv00Vj/7rRWTMvrrj2ZqG8QWUk4kO/CU=; b=eIMFCm20MHMm2XT7sTMmSERCA62a0IfX5MvZFlWQgnymj0CTkYPEqEuQhNXe14UoZZ YeNSBK5nmpz/5T6EyE+lIxKJ01LRLj0KCWEnF+E3TZiUryNOYA7LHLvuCUQvt5SNX1w3 bruH9oFzbTvpgSFY0nO4dslEfSK7n2g5awm1dQUADi7hxx4QCLo+s4Uvl6M/PW0sbqx1 FkL7/j0sgJ6w219fQWDd34HGcDEhqRhLgFsbvG7rH+8nVAgg4SeAQgdwqWHc+IKUXyXw FHefBW8s7uk6ewuMxJGMoyNOBhfkaxlc/WwIGzsq654sU4x3OrM3gNfmOQ+H6XhgVrob yXtg== X-Gm-Message-State: AOJu0Yws2TpP/sNfvoD/Aka6h+d7bSokR8nRAZ7QOgNBfkYUFMEzf20f hisRx5v6M6ljk9eG15N+Vhvcy24dkRxbe8w8RmJgk+WhQ3DRqq2IH7L5nhtpzU2jL4qq9luOd2k 4GiY1 X-Gm-Gg: Acq92OEJ160sJXRaX02e/KzKF/QlbQksgc2XTeIrldZao1SS8JYojHxrEvBpgdO0bVC jPdaPl3fiAWgopryz7W8XMFDd+1sjzk2vZPA8kyz531xZeDyKgDiBtq2tJWfFPzekRcI8Ou93MM CPoJMxVr5EsF/xQ7lVTTFToBpAdjqoNGVmp5X16CAzCLhOgDKLvLpP9xSNvx2DAVChBU2gZu/M7 ZbEqeIH1b0JTWSkcanvXfbJsl8Y9oPAxfx4I9U6OdzDYyRBwyPXXQA9NSG2uQ43HyygT5vZI+/X 0KE3uJNsU6Nsg7IlVqwaZdftPsXN+oq7fPFVpNwpDzN/6+iP30ExeK/FyWiZUyA8+dA70oC1+q/ 0Bx9ijV3tCZugYgbu7tdZAJOKLNt1mqq5c5P7wSs8r4QLdV5apcXDNQz5SCaAHqUzwlHHppxtJJ yjbwuTAntyg3zW4FN8bqV169d640yP3R/GDZmOoXL0oUZfmw== X-Received: by 2002:a05:6122:6857:10b0:56f:bb91:4861 with SMTP id 71dfb90a1353d-5760bc5ab3emr8630798e0c.0.1779202472902; Tue, 19 May 2026 07:54:32 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c1:d905:f9d7:1c9a:81ca:c01c]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-5760fadc1dasm8058887e0c.16.2026.05.19.07.54.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2026 07:54:31 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Paul Eggert Subject: [PATCH] Fix hurd bootstrap after 4c6f92daead Date: Tue, 19 May 2026 11:54:06 -0300 Message-ID: <20260519145427.27897-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 | 8 ++++++-- 3 files changed, 8 insertions(+), 3 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..8086ce5b6df 100644 --- a/timezone/private.h +++ b/timezone/private.h @@ -1072,11 +1072,15 @@ time_t timeoff(struct tm *, long); */ #if HAVE_GETTEXT -# define _(msgid) gettext(msgid) +# ifndef _ +# define _(msgid) gettext(msgid) +# endif #else /* !HAVE_GETTEXT */ # define _(msgid) (msgid) #endif /* !HAVE_GETTEXT */ -#define N_(msgid) (msgid) +#ifndef N_ +# define N_(msgid) (msgid) +#endif #if !defined TZ_DOMAIN && defined HAVE_GETTEXT # define TZ_DOMAIN "tz"