From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id C81F43858C39 for ; Tue, 9 Apr 2024 10:56:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C81F43858C39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C81F43858C39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712660173; cv=none; b=el4c+ZSwNqIzjvJnXgi5XzFz4uKFHnDitu9LU2W3iwXFgn89p07ourSl/7YaoVdYLa+/6kVNJt+4KU66niFZXwkm0lvSkP5KgLN0/8XeEIhS6X+73N/b6+nwtAybiWFnx/p8eVsXhSX+lSqWWoH8vq4FKfUVFSi7vSn/ehZQrzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712660173; c=relaxed/simple; bh=We4zKxrXaFW4zyzpi7A/GOmwJY3L5QYDqeo2hP61QcU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=txJDZFLOaH+N9M3MLK+ppewEcAFxDjbBD1RfMD4eQ8fLEw2mQEnBShK6M6amj/Y452tmBDtsxykDfuXX2oj+kf5PS/nDjzH9gve9/fop5JsDAZq/IjwXGxq0j0O5b5pDG3fCFm0gV+zLsS02gFpjsMyLQG/5hc+sPEL32eSAyII= ARC-Authentication-Results: i=1; server2.sourceware.org From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= To: libc-stable@sourceware.org Cc: Florian Weimer , Sam James Subject: [COMMITTED 2.39] i386: Use generic memrchr in libc (bug 31316) Date: Tue, 9 Apr 2024 21:55:42 +1100 Message-ID: <20240409105553.842146-1-dilfridge@gentoo.org> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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: From: Florian Weimer Before this change, we incorrectly used the SSE2 variant in the implementation, without checking that the system actually supports SSE2. Tested-by: Sam James (cherry picked from commit 0d9166c2245cad4ac520b337dee40c9a583872b6) --- sysdeps/i386/i686/multiarch/memrchr-c.c | 1 + sysdeps/i386/i686/multiarch/memrchr-sse2.S | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/i386/i686/multiarch/memrchr-c.c b/sysdeps/i386/i686/multiarch/memrchr-c.c index ef7bbbe792..20bfdf3af3 100644 --- a/sysdeps/i386/i686/multiarch/memrchr-c.c +++ b/sysdeps/i386/i686/multiarch/memrchr-c.c @@ -5,3 +5,4 @@ extern void *__memrchr_ia32 (const void *, int, size_t); #endif #include "string/memrchr.c" +strong_alias (__memrchr_ia32, __GI___memrchr) diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2.S b/sysdeps/i386/i686/multiarch/memrchr-sse2.S index d9dae04171..e123f87435 100644 --- a/sysdeps/i386/i686/multiarch/memrchr-sse2.S +++ b/sysdeps/i386/i686/multiarch/memrchr-sse2.S @@ -720,5 +720,4 @@ L(ret_null): ret END (__memrchr_sse2) -strong_alias (__memrchr_sse2, __GI___memrchr) #endif -- 2.43.2