From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from glass.ash.relay.mailchannels.net (glass.ash.relay.mailchannels.net [23.83.222.70]) by sourceware.org (Postfix) with ESMTPS id 807063858D20 for ; Tue, 8 Aug 2023 21:16:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 807063858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id AE6BB502331; Tue, 8 Aug 2023 21:16:29 +0000 (UTC) Received: from pdx1-sub0-mail-a209.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 47D75500BDF; Tue, 8 Aug 2023 21:16:27 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1691529387; a=rsa-sha256; cv=none; b=C7Bro94moeim89j9DyikGfv2jtvGRrEOBHx1dXG9Re9gsMLhO16itMUD232FdBiUtlItpU DuEwHLVWT0wlOYo2IkzpMWlaCVOY/mNQN90moh2/aW3XlAjnJNqfbQkVd09hdcwH+E6ufi 9EYUspa7zn/4Q4KNJsxJOrgSv6VIga0JZJpIZRfV5nQ73CaQg0gMPZTX4WQr6UQyermT0F iYt6lFun0cVcii4njY4bZp1iTAvsz2+wYZD2pDHdP926HPmvh60/Vf3ovvs96RQk3/4Uh9 gdBGw3ClO/9uLCXL4PqXSd6FgvTW1MMwOgG1gVNoN3g4JlYD8pBP/xhzfuk9RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1691529387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=DK3uttYySAFR88GkAJ1jg7bT3QEhtBWjbbzk4APK+JQ=; b=WJKr40ts7c77FzjXF34lV7qT7+pJ24LhvsvNZEDRbT2qPbBjinL1fy8tVmK93c7kZag+w0 +egCII2UcozGsZqeq+qe5maIgG4ZX/bN20yEz2OjnbY1kLXKcMXczYCpXZwEu9aciu6dkc m2MuPX3eHDI0W/K57NP8OzhzCWvBQHDYQR4a0GIpflqN46GJHu6Sl/TOnrWBd6meVWainX jJgcvc/gi+/W5H5zhQFMGsXqYCDnekWaAcTB85uE/6h565e4CAryp7WyAhZSnswDHiTsnN tB6I2Ue4qMBKptUjagkvV/qsmx4djO00HN7ZQsQXh4fbfdepZWUDsIDQb75Jlg== ARC-Authentication-Results: i=1; rspamd-849d547c58-g2lcl; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Vacuous-Illegal: 3be8939f101f33a1_1691529389511_4123067397 X-MC-Loop-Signature: 1691529389511:1996299944 X-MC-Ingress-Time: 1691529389511 Received: from pdx1-sub0-mail-a209.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.109.205.135 (trex/6.9.1); Tue, 08 Aug 2023 21:16:29 +0000 Received: from [192.168.2.12] (bras-vprn-toroon4834w-lp130-02-142-113-138-184.dsl.bell.ca [142.113.138.184]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a209.dreamhost.com (Postfix) with ESMTPSA id 4RL5bG50mxzB3; Tue, 8 Aug 2023 14:16:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1691529387; bh=DK3uttYySAFR88GkAJ1jg7bT3QEhtBWjbbzk4APK+JQ=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=kld5gluMmF3dY6MUDF3HCDpymXQzrqP7f61T8I+PdV2a9d9oN39OK++K7foMltpqj BQEwE/7QSHwJDINNBmQL/Dq4LgOmYJGv45KPEMxRCkT8g9TnrY2WBH+gKrlPatC+tP xlWVk0Ej35IEmadNSjVmf7P8+JnPPEwznnrbQfRZ/xk52W3RPhyD9HcvZoWRvTj9HI gk6w3qFbjeFsz34F2BFkVRrW30D8VMdjohDlxhlZ62JNEn8Pzf3mRuUHyuS046tS0L hydoB5PHjTb0v7GhfbZ1nvYE8hayHIZg0J8iRHIoTWLgoRqBQ5Zsji2tMJzK/ClLzz UqSDdqVSIzJYw== Message-ID: <5faf159a-1d54-34cc-8b7c-72d5d774f9ab@gotplt.org> Date: Tue, 8 Aug 2023 17:16:25 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH 1/2] x86_64: Fix build with --disable-multiarch (BZ 30721) Content-Language: en-US To: Adhemerval Zanella , libc-alpha@sourceware.org, "Andreas K . Huettel" References: <20230808122755.66307-1-adhemerval.zanella@linaro.org> <20230808122755.66307-2-adhemerval.zanella@linaro.org> From: Siddhesh Poyarekar In-Reply-To: <20230808122755.66307-2-adhemerval.zanella@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3038.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 2023-08-08 08:27, Adhemerval Zanella via Libc-alpha wrote: > With multiarch disabled, the default memmove implementation provides > the fortify routines for memcpy, mempcpy, and memmove. However, it > does not provide the internal hidden definitions used when building > with fortify enabled. The memset has a similar issue. > > Checked on x86_64-linux-gnu building with different options: > default and --disable-multi-arch plus default, --disable-default-pie, > --enable-fortify-source={2,3}, and --enable-fortify-source={2,3} > with --disable-default-pie. > --- LGTM. Reviewed-by: Siddhesh Poyarekar > sysdeps/x86_64/memcpy.S | 2 +- > sysdeps/x86_64/memmove.S | 3 +++ > sysdeps/x86_64/memset.S | 1 + > 3 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/sysdeps/x86_64/memcpy.S b/sysdeps/x86_64/memcpy.S > index d98500a78a..4922cba657 100644 > --- a/sysdeps/x86_64/memcpy.S > +++ b/sysdeps/x86_64/memcpy.S > @@ -1 +1 @@ > -/* Implemented in memcpy.S. */ > +/* Implemented in memmove.S. */ > diff --git a/sysdeps/x86_64/memmove.S b/sysdeps/x86_64/memmove.S > index f0b84e3b52..c3c08165e1 100644 > --- a/sysdeps/x86_64/memmove.S > +++ b/sysdeps/x86_64/memmove.S > @@ -46,6 +46,9 @@ weak_alias (__mempcpy, mempcpy) > > #ifndef USE_MULTIARCH > libc_hidden_builtin_def (memmove) > +libc_hidden_builtin_def (__memmove_chk) > +libc_hidden_builtin_def (__memcpy_chk) > +libc_hidden_builtin_def (__mempcpy_chk) > # if defined SHARED && IS_IN (libc) > strong_alias (memmove, __memcpy) > libc_hidden_ver (memmove, memcpy) > diff --git a/sysdeps/x86_64/memset.S b/sysdeps/x86_64/memset.S > index 7c99df36db..c6df24e8de 100644 > --- a/sysdeps/x86_64/memset.S > +++ b/sysdeps/x86_64/memset.S > @@ -32,6 +32,7 @@ > #include "isa-default-impl.h" > > libc_hidden_builtin_def (memset) > +libc_hidden_builtin_def (__memset_chk) > > #if IS_IN (libc) > libc_hidden_def (__wmemset)