Message ID | 20220630015618.3586787-3-goldstein.w.n@gmail.com |
---|---|
State | New |
Headers | show |
Series | [v1] x86: Add missing IS_IN (libc) check to strncmp-sse4_2.S | expand |
On Wed, Jun 29, 2022 at 6:56 PM Noah Goldstein <goldstein.w.n@gmail.com> wrote: > > Was missing to for the multiarch build rtld-strncmp-sse4_2.os was > being built and exporting symbols: > > build/glibc/string/rtld-strncmp-sse4_2.os: > 0000000000000000 T __strncmp_sse42 > > Introduced in: > > commit 11ffcacb64a939c10cfc713746b8ec88837f5c4a > Author: H.J. Lu <hjl.tools@gmail.com> > Date: Wed Jun 21 12:10:50 2017 -0700 > > x86-64: Implement strcmp family IFUNC selectors in C > --- > sysdeps/x86_64/multiarch/strncmp-sse4_2.S | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/sysdeps/x86_64/multiarch/strncmp-sse4_2.S b/sysdeps/x86_64/multiarch/strncmp-sse4_2.S > index 9773e5fc09..310a6dbe77 100644 > --- a/sysdeps/x86_64/multiarch/strncmp-sse4_2.S > +++ b/sysdeps/x86_64/multiarch/strncmp-sse4_2.S > @@ -16,6 +16,8 @@ > License along with the GNU C Library; if not, see > <https://www.gnu.org/licenses/>. */ > > -#define STRCMP_SSE42 __strncmp_sse42 > -#define USE_AS_STRNCMP > -#include "strcmp-sse42.S" > +#if IS_IN (libc) > +# define STRCMP_SSE42 __strncmp_sse42 > +# define USE_AS_STRNCMP > +# include "strcmp-sse42.S" > +#endif > -- > 2.34.1 > LGTM. Thanks.
On Wed, Jun 29, 2022 at 7:04 PM H.J. Lu via Libc-alpha <libc-alpha@sourceware.org> wrote: > > On Wed, Jun 29, 2022 at 6:56 PM Noah Goldstein <goldstein.w.n@gmail.com> wrote: > > > > Was missing to for the multiarch build rtld-strncmp-sse4_2.os was > > being built and exporting symbols: > > > > build/glibc/string/rtld-strncmp-sse4_2.os: > > 0000000000000000 T __strncmp_sse42 > > > > Introduced in: > > > > commit 11ffcacb64a939c10cfc713746b8ec88837f5c4a > > Author: H.J. Lu <hjl.tools@gmail.com> > > Date: Wed Jun 21 12:10:50 2017 -0700 > > > > x86-64: Implement strcmp family IFUNC selectors in C > > --- > > sysdeps/x86_64/multiarch/strncmp-sse4_2.S | 8 +++++--- > > 1 file changed, 5 insertions(+), 3 deletions(-) > > > > diff --git a/sysdeps/x86_64/multiarch/strncmp-sse4_2.S b/sysdeps/x86_64/multiarch/strncmp-sse4_2.S > > index 9773e5fc09..310a6dbe77 100644 > > --- a/sysdeps/x86_64/multiarch/strncmp-sse4_2.S > > +++ b/sysdeps/x86_64/multiarch/strncmp-sse4_2.S > > @@ -16,6 +16,8 @@ > > License along with the GNU C Library; if not, see > > <https://www.gnu.org/licenses/>. */ > > > > -#define STRCMP_SSE42 __strncmp_sse42 > > -#define USE_AS_STRNCMP > > -#include "strcmp-sse42.S" > > +#if IS_IN (libc) > > +# define STRCMP_SSE42 __strncmp_sse42 > > +# define USE_AS_STRNCMP > > +# include "strcmp-sse42.S" > > +#endif > > -- > > 2.34.1 > > > > LGTM. > > Thanks. > > -- > H.J. I would like to backport this patch to release branches. Any comments or objections? --Sunil
diff --git a/sysdeps/x86_64/multiarch/strncmp-sse4_2.S b/sysdeps/x86_64/multiarch/strncmp-sse4_2.S index 9773e5fc09..310a6dbe77 100644 --- a/sysdeps/x86_64/multiarch/strncmp-sse4_2.S +++ b/sysdeps/x86_64/multiarch/strncmp-sse4_2.S @@ -16,6 +16,8 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#define STRCMP_SSE42 __strncmp_sse42 -#define USE_AS_STRNCMP -#include "strcmp-sse42.S" +#if IS_IN (libc) +# define STRCMP_SSE42 __strncmp_sse42 +# define USE_AS_STRNCMP +# include "strcmp-sse42.S" +#endif