From patchwork Wed Jul 19 15:40:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 21687 Received: (qmail 55116 invoked by alias); 19 Jul 2017 15:40:48 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 54111 invoked by uid 89); 19 Jul 2017 15:40:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-oi0-f53.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=7a4X3ITau1SOABYEOh74TLTamEY+zCg2A29P1OmHasw=; b=W29ModCEWVjN/aPzL2nB6huPsj6Dvg//MbKkySBBXi7M/XtMW6NvhauB6mKwe0SZLi cRbsz5LLW5jAqb7NTCRNu+yV8OmrMVd8HX1JwbH+tPS52nl76oTp1dB02FSSqah1NfhL Oy/ldyFz4bHPtrL6t39iZskQQ+0idjmqxdYQ4BqAE9mTyHDOeKGj0SG7/98LWm0ACJTn h2ebv6LzoJ+uOKQjx9BEtO+O/6rY36U7ZUci/xPgMUiMj4+KigKkjmI/QL2BbbhQOkz4 AaEirXtiq6ZC+mNPRKbIiAe0D+gc2x4W42qw2cCnqQyPlUFUVBvjHUC5cyYeLwPnZfu+ /yog== X-Gm-Message-State: AIVw111SK9xUq3kj2TbKs+Z0aFnifeCqgw9c75mayi2lQAgV9/7+LPgw dk+8ADEIaz3Vaargs+X8HARrBFJJsw== X-Received: by 10.202.104.139 with SMTP id o11mr1999954oik.66.1500478844492; Wed, 19 Jul 2017 08:40:44 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <20170709212717.GA10107@gmail.com> From: "H.J. Lu" Date: Wed, 19 Jul 2017 08:40:43 -0700 Message-ID: Subject: Re: [PATCH] x86-64: Test memmove_chk and memset_chk only in libc.so [BZ #21741] To: Andreas Schwab Cc: GNU C Library On Mon, Jul 10, 2017 at 12:28 AM, Andreas Schwab wrote: > On Jul 09 2017, "H.J. Lu" wrote: > >> [BZ #21741] >> * sysdeps/x86_64/multiarch/ifunc-impl-list.c >> (__libc_ifunc_impl_list): Test memmove_chk and memset_chk only >> in libc.so. > > Ok. > > Andreas. > i386 has the same issue. I am checking in this. From 47f27396591fdc4875ecc1663f6d4315edacb5a1 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 19 Jul 2017 08:39:18 -0700 Subject: [PATCH] i386: Test memmove_chk and memset_chk only in libc.so [BZ #21741] Since there are no multiarch versions of memmove_chk and memset_chk, test multiarch versions of memmove_chk and memset_chk only in libc.so. [BZ #21741] * sysdeps/i386/i686/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Test memmove_chk and memset_chk only in libc.so. --- ChangeLog | 7 +++++++ sysdeps/i386/i686/multiarch/ifunc-impl-list.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index b9dc70573b..d514f08b53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2017-07-19 H.J. Lu + [BZ #21741] + * sysdeps/i386/i686/multiarch/ifunc-impl-list.c + (__libc_ifunc_impl_list): Test memmove_chk and memset_chk only + in libc.so. + +2017-07-19 H.J. Lu + [BZ #21740] * debug/Makefile (elide-routines.o): New. diff --git a/sysdeps/i386/i686/multiarch/ifunc-impl-list.c b/sysdeps/i386/i686/multiarch/ifunc-impl-list.c index e8026a2a78..6e20cffb04 100644 --- a/sysdeps/i386/i686/multiarch/ifunc-impl-list.c +++ b/sysdeps/i386/i686/multiarch/ifunc-impl-list.c @@ -70,6 +70,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __memcmp_ssse3) IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_ia32)) +#ifdef SHARED /* Support sysdeps/i386/i686/multiarch/memmove_chk.S. */ IFUNC_IMPL (i, name, __memmove_chk, IFUNC_IMPL_ADD (array, i, __memmove_chk, @@ -83,6 +84,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __memmove_chk_sse2_unaligned) IFUNC_IMPL_ADD (array, i, __memmove_chk, 1, __memmove_chk_ia32)) +#endif /* Support sysdeps/i386/i686/multiarch/memmove.S. */ IFUNC_IMPL (i, name, memmove, @@ -102,6 +104,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __memrchr_sse2) IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_ia32)) +#ifdef SHARED /* Support sysdeps/i386/i686/multiarch/memset_chk.S. */ IFUNC_IMPL (i, name, __memset_chk, IFUNC_IMPL_ADD (array, i, __memset_chk, @@ -112,6 +115,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __memset_chk_sse2) IFUNC_IMPL_ADD (array, i, __memset_chk, 1, __memset_chk_ia32)) +#endif /* Support sysdeps/i386/i686/multiarch/memset.S. */ IFUNC_IMPL (i, name, memset, -- 2.13.3