From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw1-x1135.google.com (mail-yw1-x1135.google.com [IPv6:2607:f8b0:4864:20::1135]) by sourceware.org (Postfix) with ESMTPS id B46283858D1E for ; Tue, 30 Apr 2024 20:12:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B46283858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B46283858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1135 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714507934; cv=none; b=YwLpnVuKYSaegC7wBrP6kQLuP5c4tKJ0dNjHxl7dE41B4JlWHjLMcIeUaRUyiEJ198d1lNPUK7cYYyqhDcW8bi0VFm2B4yBnj5Yz7M/Al9ueXFWgRU+8IQSJzbq1x/tG9+eJWHGxatkoUqzOduRcioJ1g7jGXyh6JH/VcwDQT+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714507934; c=relaxed/simple; bh=ZwdrpLS+oQYb4xtxDGJ72fjVNB2ZxnKkn2zQgVAbuVQ=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=qu7zFAZLu7fCQHsLms27eXVGJHSOXcGkyu9Xaw797vNs5OkHU2+S1j4xQY00AZc0Yai+09zYWdUlyGGSx3arkt19bzxGXQdOzKzQz85H7BnNgLLjy6mvClEhqtDsMxvaRB1jh3jYaNzoMwRnilCmXOGBk3Z37HsAZLPEPnGwAZM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yw1-x1135.google.com with SMTP id 00721157ae682-61df496df01so6488417b3.3 for ; Tue, 30 Apr 2024 13:12:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714507931; x=1715112731; darn=sourceware.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=xoyF9PNMH2tnEPxqMFVCmrJEOvsR58RG/Az9Ww6sVNc=; b=Ld2NY9y3SO8IbjsyRjLagyjysbp8QPOVxmnu+kyMXHlZ3Ix8HoOg5CWHH/pGNcUUg6 IUGs3m9TRN+rE0w0lhT0jSMd4HnsoYJPBFHehpsMVd0rzPkCifrgHqjmbaAMktW5aMiS dMDXJ6mLnpQVOnPdF3J+oAJyc8nXlhc/Dt0Anj3THBhxT631uM+NS6uLDeT50Y127e5H PLpCW5lOCouCxW+Z1oDUGVop3VpQDTabVkaQh2cwxh2OLItSqqYI4Ib+SYOjxa3DSTZ+ HplNetTXB2NR84AceLvfshn6NSQfIpLgX3/gyTnwZaV4R6VGJrFR6R76ZNiEkSvpOx5d iZvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714507931; x=1715112731; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xoyF9PNMH2tnEPxqMFVCmrJEOvsR58RG/Az9Ww6sVNc=; b=H335BdlRjSd/pmB+IsMn5hULrjr/3d8GBlVglw7TSVxDg5eaRrGYneDM1uv8JZ0khB /zFTrHoQsBcEW79oTtcOZ9SPOlTtjsIkCqAOeiJW61Vjd6hO3b2X2JZx+VHzqoTslKkg lX/17H3O7q1xkFyOoW2tCiz9dQ8v3sXrwfWxKKNdoyRca/9bR6S1tuU3k9BTLgron2Mc SqVA6GMKwTf3s3bLst6ioKyVYXExDRz4XQ+VJha19mBZ+DqU4sUmzQm5MpbEVAzpP7/E VModkVh+Tprjs4PnAlUST/u69MKK0mrisSZ/+ywH2H4ELgT/P92RVAq16Fim9Jtc35Ps e3/A== X-Gm-Message-State: AOJu0YzcL+dPCMlkZpGrjh3v5k+E2e1XcXDAnvmSHesyJp+v1E2BgwZJ WNGXeUo0euVkp6debwPnEmI7TxcHZclIkpjCzNRJboOE/ESzBQMWx8I6Sq9cd4T1tyK89PhqYXl 0QerXImI/jy5xDlM0CXYlzRPtlv8= X-Google-Smtp-Source: AGHT+IGfG4NEp7ihpvSOlbZo2wigQXga1dQwiv22/Kfy7GPxjK3Ee+VYlbrDyUjCHM0Ws2EGWsRBdHF1shpVdl5tre4= X-Received: by 2002:a05:690c:3805:b0:61b:3454:dbeb with SMTP id jx5-20020a05690c380500b0061b3454dbebmr699178ywb.46.1714507931071; Tue, 30 Apr 2024 13:12:11 -0700 (PDT) MIME-Version: 1.0 References: <20240430200506.2717717-1-gabifalk@gmx.com> <20240430200506.2717717-2-gabifalk@gmx.com> In-Reply-To: <20240430200506.2717717-2-gabifalk@gmx.com> From: "H.J. Lu" Date: Tue, 30 Apr 2024 13:11:35 -0700 Message-ID: Subject: Re: [PATCH 1/3] i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk To: Gabi Falk Cc: libc-alpha@sourceware.org, Florian Weimer , "Dmitry V. Levin" , Sam James Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-3019.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,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 Tue, Apr 30, 2024 at 1:05=E2=80=AFPM Gabi Falk wrote: > > /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-g= nu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs= /i586-linux-gnu/glibc/libc.a(memcpy_chk.o): in function `__memcpy_chk': > /home/bmg/src/glibc/debug/../sysdeps/i386/memcpy_chk.S:29: multiple defin= ition of `__memcpy_chk';/home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(= memcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: firs= t defined here /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-= glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg= /build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy_chk.o): in function `__me= mpcpy_chk': /home/bmg/src/glibc/debug/../sysdeps/i386/mempcpy_chk.S:28: mul= tiple definition of `__mempcpy_chk'; /home/bmg/build/glibcs/i586-linux-gnu/= glibc/libc.a(mempcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/mem= cpy.S:31: first defined here > > After this change, the static library built for i586, regardless of PIC > options, contains implementations of these functions respectively from > sysdeps/i386/memcpy_chk.S and sysdeps/i386/mempcpy_chk.S. This ensures > that memcpy and mempcpy won't pull in __chk_fail and the routines it > calls. > > Reported-by: Florian Weimer > Signed-off-by: Gabi Falk > --- > sysdeps/i386/i586/memcpy.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S > index 3e26f112d6..79856d498a 100644 > --- a/sysdeps/i386/i586/memcpy.S > +++ b/sysdeps/i386/i586/memcpy.S > @@ -26,7 +26,7 @@ > #define LEN SRC+4 > > .text > -#if defined PIC && IS_IN (libc) > +#if defined SHARED && IS_IN (libc) > ENTRY (__memcpy_chk) > movl 12(%esp), %eax > cmpl %eax, 16(%esp) > -- > gabi > LGTM. Reviewed-by: H.J. Lu Thanks. --=20 H.J.