From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=744J=JY=gmail.com=hjl.tools@sourceware.org>
Received: from mail-yw1-x112d.google.com (mail-yw1-x112d.google.com [IPv6:2607:f8b0:4864:20::112d])
	by sourceware.org (Postfix) with ESMTPS id 9EB2B3865C22
	for <libc-alpha@sourceware.org>; Thu, 15 Feb 2024 18:49:12 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9EB2B3865C22
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 9EB2B3865C22
Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::112d
ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708022955; cv=none;
	b=tGw+7iObaJMNMYZcmtoBF2lEdHpQjz3qvZHHmIaPzOqpaLsDi47T3bsQ3oW3Z6AeduxRuRby7t9C2GcRmRQldhHs9gemiJQyFwDg39t7NxhmByC68CXDQUg96U97s8TDal9Fy90XdY5PXrGpTjvSo3AJ/HlFmDSWurCz7/LnbBM=
ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key;
	t=1708022955; c=relaxed/simple;
	bh=7YV4yrQXTQVCpGFk79kdtur6kqPqgi0I1hO59K9vzcQ=;
	h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=eB+Xpz3GrH9OuDHcjgAvT1PPR7DHXiItiC1W3l4jd1aUmL53IZqjAQUZOn7fO9i2F5wNn4r/K+lPHphGXSsHFnHRifNhJASkwrPLqaVSdEo8CCCCsUQs+TXJrTqFsijnNLCfVRiHx0XUGVUrE8A7ONBS3MhfPg0yBoxY00v0Ke4=
ARC-Authentication-Results: i=1; server2.sourceware.org
Received: by mail-yw1-x112d.google.com with SMTP id 00721157ae682-607cd210962so9605887b3.2
        for <libc-alpha@sourceware.org>; Thu, 15 Feb 2024 10:49:12 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1708022952; x=1708627752; darn=sourceware.org;
        h=content-transfer-encoding:to:subject:message-id:date:from
         :in-reply-to:references:mime-version:from:to:cc:subject:date
         :message-id:reply-to;
        bh=kdgTxUVsIzHjNZnHGquLOTqBZJe+wmzQfbgZDDDufSQ=;
        b=htRgpvMwAqpidf+x9g12MFtg4URrhXTWsNnKkL6lDkB0mSPGEGL3ifEu8C7dqmpRWW
         SUiJ/XHwNunhcQldshU3qPD0c7ma2OSYAne2NVYseAT/KOebt/uyuDCLgabwzBNM+SRB
         YZLT3H/wU++GLGfU6hnv+crhhE49teYqxYYlQTIjkLUHgsZRdazYnYYgDjGUYjV6E9lA
         ND0tYh3IlmwcJLFgGpowGkN4UIwevzt9CYxTHd/yzqfJQtyF3je7rFzowP4aqwnHois1
         ERisc3kqbaBf/qyMfy6eVYw/i1lMFhbRQn+xHVtvAIAfXvh01+Ph+CAmj3JQVFsMrdiE
         fAWw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1708022952; x=1708627752;
        h=content-transfer-encoding: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=kdgTxUVsIzHjNZnHGquLOTqBZJe+wmzQfbgZDDDufSQ=;
        b=W1Beg5SmeBRXNih6wOK65jjToFZxllgLyPwPggEZIgPDJ8q8dTdIDkrQ0yfH6DF8Z2
         9qMRFflxShASyWmgZNZ7dKtltQlRIORczqziPHespqJ1lmCZgTrfp38wyKP/+R4iDllr
         zM5Crs+VnDd0GiW1IX/S9eCA6UZlWpGdWSv99nMrZpSshxzeKxr3yvH9oefs9ALG+CDP
         unpHeliCA8PnvmAfya676nmg/a2OqhkK0OmxsR35OsYW4wFA1SOty+lMABLUzCw5bAE2
         wJb108HsGVWV9kXEZGWaAmBrEJsB7dSPGjPQeBrghpVAPk/if6i+6edDk42LXe0kSNGx
         gh3A==
X-Gm-Message-State: AOJu0Yxb+tkHqoiqb2r+m5WZvZLRXk2uvLmAUUNFFqxvj5NEyNk7aOqe
	tSArGLuFY3HWaj4hkrjJoloRqDvPbj2qw3TRwkVDGrAi6T0m+CLC3MmFgeEYhE5dMduOuK86dZo
	iAphLtDN11bXwNYQFuXsHLU9vmT0l9UrD
X-Google-Smtp-Source: AGHT+IE5Ijl4FojHETlWLXXaiJ9Opj2zh883auMpcxm0tkxsccYV4CKPfVH6EkCPFIs/vpEKAZ0VeNttCenQ7HQwk2M=
X-Received: by 2002:a81:a743:0:b0:607:9dda:676c with SMTP id
 e64-20020a81a743000000b006079dda676cmr2513709ywh.18.1708022951670; Thu, 15
 Feb 2024 10:49:11 -0800 (PST)
MIME-Version: 1.0
References: <20240215184434.2482576-1-hjl.tools@gmail.com>
In-Reply-To: <20240215184434.2482576-1-hjl.tools@gmail.com>
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 15 Feb 2024 10:48:35 -0800
Message-ID: <CAMe9rOq1bC-k=Ghd=px1U_HQO=ENFO0MeGSb59vxir8ZTKBC_Q@mail.gmail.com>
Subject: Re: [PATCH] Apply the Makefile sorting fix
To: libc-alpha@sourceware.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Spam-Status: No, score=-3020.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,T_SCC_BODY_TEXT_LINE 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: <libc-alpha.sourceware.org>

On Thu, Feb 15, 2024 at 10:44=E2=80=AFAM H.J. Lu <hjl.tools@gmail.com> wrot=
e:
>
> Apply the Makefile sorting fix generated by sort-makefile-lines.py.
> ---
>  sysdeps/loongarch/lp64/multiarch/Makefile |  80 +++----
>  sysdeps/x86/Makefile                      |   6 +-
>  sysdeps/x86_64/Makefile                   | 256 +++++++++++-----------
>  sysdeps/x86_64/fpu/multiarch/Makefile     |  14 +-
>  sysdeps/x86_64/multiarch/Makefile         |   4 +-
>  5 files changed, 180 insertions(+), 180 deletions(-)
>
> diff --git a/sysdeps/loongarch/lp64/multiarch/Makefile b/sysdeps/loongarc=
h/lp64/multiarch/Makefile
> index fe863e1ba4..01762ef526 100644
> --- a/sysdeps/loongarch/lp64/multiarch/Makefile
> +++ b/sysdeps/loongarch/lp64/multiarch/Makefile
> @@ -1,52 +1,52 @@
>  ifeq ($(subdir),string)
>  sysdep_routines +=3D \
> -  strlen-aligned \
> -  strlen-lsx \
> -  strlen-lasx \
> -  strnlen-aligned \
> -  strnlen-lsx \
> -  strnlen-lasx \
> +  memchr-aligned \
> +  memchr-lasx \
> +  memchr-lsx \
> +  memcmp-aligned \
> +  memcmp-lasx \
> +  memcmp-lsx \
> +  memcpy-aligned \
> +  memcpy-unaligned \
> +  memmove-lasx \
> +  memmove-lsx \
> +  memmove-unaligned \
> +  memrchr-generic \
> +  memrchr-lasx \
> +  memrchr-lsx \
> +  memset-aligned \
> +  memset-lasx \
> +  memset-lsx \
> +  memset-unaligned \
> +  rawmemchr-aligned \
> +  rawmemchr-lasx \
> +  rawmemchr-lsx \
> +  stpcpy-aligned \
> +  stpcpy-lasx \
> +  stpcpy-lsx \
> +  stpcpy-unaligned \
>    strchr-aligned \
> -  strchr-lsx \
>    strchr-lasx \
> -  strrchr-aligned \
> -  strrchr-lsx \
> -  strrchr-lasx \
> +  strchr-lsx \
>    strchrnul-aligned \
> -  strchrnul-lsx \
>    strchrnul-lasx \
> +  strchrnul-lsx \
>    strcmp-aligned \
>    strcmp-lsx \
> -  strncmp-aligned \
> -  strncmp-lsx \
>    strcpy-aligned \
> -  strcpy-unaligned \
> -  strcpy-lsx \
>    strcpy-lasx \
> -  stpcpy-aligned \
> -  stpcpy-unaligned \
> -  stpcpy-lsx \
> -  stpcpy-lasx \
> -  memcpy-aligned \
> -  memcpy-unaligned \
> -  memmove-unaligned \
> -  memmove-lsx \
> -  memmove-lasx \
> -  rawmemchr-aligned \
> -  rawmemchr-lsx \
> -  rawmemchr-lasx \
> -  memchr-aligned \
> -  memchr-lsx \
> -  memchr-lasx \
> -  memrchr-generic \
> -  memrchr-lsx \
> -  memrchr-lasx \
> -  memset-aligned \
> -  memset-unaligned \
> -  memset-lsx \
> -  memset-lasx \
> -  memcmp-aligned \
> -  memcmp-lsx \
> -  memcmp-lasx \
> +  strcpy-lsx \
> +  strcpy-unaligned \
> +  strlen-aligned \
> +  strlen-lasx \
> +  strlen-lsx \
> +  strncmp-aligned \
> +  strncmp-lsx \
> +  strnlen-aligned \
> +  strnlen-lasx \
> +  strnlen-lsx \
> +  strrchr-aligned \
> +  strrchr-lasx \
> +  strrchr-lsx \
>  # sysdep_routines
>  endif
> diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
> index 4d50b327b5..73b29cc78c 100644
> --- a/sysdeps/x86/Makefile
> +++ b/sysdeps/x86/Makefile
> @@ -15,18 +15,18 @@ CFLAGS-dl-get-cpu-features.os +=3D $(rtld-early-cflag=
s)
>  CFLAGS-get-cpuid-feature-leaf.o +=3D $(no-stack-protector)
>
>  tests +=3D \
> -  tst-get-cpu-features \
> -  tst-get-cpu-features-static \
>    tst-cpu-features-cpuinfo \
>    tst-cpu-features-cpuinfo-static \
>    tst-cpu-features-supports \
>    tst-cpu-features-supports-static \
> +  tst-get-cpu-features \
> +  tst-get-cpu-features-static \
>    tst-hwcap-tunables \
>  # tests
>  tests-static +=3D \
> -  tst-get-cpu-features-static \
>    tst-cpu-features-cpuinfo-static \
>    tst-cpu-features-supports-static \
> +  tst-get-cpu-features-static \
>  # tests-static
>  ifeq (yes,$(have-ifunc))
>  ifeq (yes,$(have-gcc-ifunc))
> diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
> index 90f4ecfd26..e7119bc9e9 100644
> --- a/sysdeps/x86_64/Makefile
> +++ b/sysdeps/x86_64/Makefile
> @@ -32,161 +32,161 @@ sysdep_routines +=3D \
>  # sysdep_routines
>  gen-as-const-headers +=3D locale-defines.sym
>  tests +=3D \
> -  tst-rsi-strlen
> -endif
> -
> -ifeq ($(subdir),elf)
> -# There is no good reason to use MMX in x86-64 ld.so with GCC.
> -CFLAGS-.os +=3D $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routine=
s))),\
> +                        $(objpfx)tst-auditmod6c.so
>                    -mno-mmx)
> +                  tst-avx-aux.o tst-avx512-aux.o
> +               tst-auditmod10a tst-auditmod10b \
> +               tst-auditmod4a tst-auditmod4b \
> +               tst-auditmod5a tst-auditmod5b \
> +               tst-auditmod6a tst-auditmod6b tst-auditmod6c \
> +               tst-auditmod7a tst-auditmod7b \
> +               tst-ssemod tst-avxmod tst-avx512mod
> +              tst-avx-aux tst-avx512-aux
> +        tst-audit10 tst-sse tst-avx tst-avx512
> +       $(make-target-directory)
> +       $(make-target-directory)
> +       $(make-target-directory)
> +       $(make-target-directory)
> +       $(make-target-directory)
> +       $(make-target-directory)
> +       GLIBC_TUNABLES=3Dglibc.cpu.hwcaps=3D-AVX512F,-AVX2
> +       cp $< $@
> +       cp $< $@
> +       cp $< $@
> +       cp $< $@
> +       cp $< $@
> +       cp $< $@
> +
> +
> +
> +
>

This doesn't look right.

> -sysdep-dl-routines +=3D tlsdesc dl-tlsdesc tls_get_addr
>
> -tests +=3D ifuncmain8
> -modules-names +=3D ifuncmod8
>
> -$(objpfx)ifuncmain8: $(objpfx)ifuncmod8.so
>
> -tests +=3D tst-quad1 tst-quad2
> -modules-names +=3D tst-quadmod1 tst-quadmod2
>
> -$(objpfx)tst-quad1: $(objpfx)tst-quadmod1.so
> -$(objpfx)tst-quad2: $(objpfx)tst-quadmod2.so
>
> -quad-pie-test +=3D tst-quad1pie tst-quad2pie
> -tests +=3D $(quad-pie-test)
> -tests-pie +=3D $(quad-pie-test)
> -test-extras +=3D tst-quadmod1pie tst-quadmod2pie
> -extra-test-objs +=3D tst-quadmod1pie.o tst-quadmod2pie.o
>
> -$(objpfx)tst-quad1pie: $(objpfx)tst-quadmod1pie.o
> -$(objpfx)tst-quad2pie: $(objpfx)tst-quadmod2pie.o
>
> -CFLAGS-tst-quad1pie.c =3D $(PIE-ccflag)
> -CFLAGS-tst-quad2pie.c =3D $(PIE-ccflag)
>
> -tests +=3D tst-platform-1
> -modules-names +=3D tst-platformmod-1 x86_64/tst-platformmod-2
> -extra-test-objs +=3D tst-platformmod-2.o
> -CFLAGS-tst-platform-1.c =3D -mno-avx
> -CFLAGS-tst-platformmod-1.c =3D -mno-avx
> -CFLAGS-tst-platformmod-2.c =3D -mno-avx
> -LDFLAGS-tst-platformmod-2.so =3D -Wl,-soname,tst-platformmod-2.so
> -$(objpfx)tst-platform-1: $(objpfx)tst-platformmod-1.so
> -$(objpfx)tst-platform-1.out: $(objpfx)x86_64/tst-platformmod-2.so
> -# Turn off AVX512F and AVX2 so that GLRO(dl_platform) is
> -# always set to x86_64.
> -tst-platform-1-ENV =3D LD_PRELOAD=3D$(objpfx)\$$PLATFORM/tst-platformmod=
-2.so \
> -       GLIBC_TUNABLES=3Dglibc.cpu.hwcaps=3D-AVX512F,-AVX2
>
> -tests +=3D tst-audit3 tst-audit4 tst-audit5 tst-audit6 tst-audit7 \
> -        tst-audit10 tst-sse tst-avx tst-avx512
> -test-extras +=3D tst-audit4-aux tst-audit10-aux \
> -              tst-avx-aux tst-avx512-aux
> -extra-test-objs +=3D tst-audit4-aux.o tst-audit10-aux.o \
> -                  tst-avx-aux.o tst-avx512-aux.o
>
> -ifeq ($(have-insert),yes)
> -tests +=3D tst-split-dynreloc
> -LDFLAGS-tst-split-dynreloc =3D -Wl,-T,$(..)sysdeps/x86_64/tst-split-dynr=
eloc.lds
> -tst-split-dynreloc-ENV =3D LD_BIND_NOW=3D1
> -endif
>
> -modules-names +=3D tst-auditmod3a tst-auditmod3b \
> -               tst-auditmod4a tst-auditmod4b \
> -               tst-auditmod5a tst-auditmod5b \
> -               tst-auditmod6a tst-auditmod6b tst-auditmod6c \
> -               tst-auditmod7a tst-auditmod7b \
> -               tst-auditmod10a tst-auditmod10b \
> -               tst-ssemod tst-avxmod tst-avx512mod
>
> -$(objpfx)tst-audit3: $(objpfx)tst-auditmod3a.so
> -$(objpfx)tst-audit3.out: $(objpfx)tst-auditmod3b.so
> -tst-audit3-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod3b.so
>
> -$(objpfx)tst-audit4: $(objpfx)tst-audit4-aux.o $(objpfx)tst-auditmod4a.s=
o
> -$(objpfx)tst-audit4.out: $(objpfx)tst-auditmod4b.so
> -tst-audit4-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod4b.so
>
> -$(objpfx)tst-audit5: $(objpfx)tst-auditmod5a.so
> -$(objpfx)tst-audit5.out: $(objpfx)tst-auditmod5b.so
> -tst-audit5-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod5b.so
>
> -$(objpfx)tst-audit6: $(objpfx)tst-auditmod6a.so
> -$(objpfx)tst-audit6.out: $(objpfx)tst-auditmod6b.so \
> -                        $(objpfx)tst-auditmod6c.so
> -tst-audit6-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod6b.so:$(objpfx)tst-au=
ditmod6c.so
>
> -$(objpfx)tst-audit7: $(objpfx)tst-auditmod7a.so
> -$(objpfx)tst-audit7.out: $(objpfx)tst-auditmod7b.so
> -tst-audit7-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod7b.so
>
> -$(objpfx)tst-audit10: $(objpfx)tst-audit10-aux.o $(objpfx)tst-auditmod10=
a.so
> -$(objpfx)tst-audit10.out: $(objpfx)tst-auditmod10b.so
> -tst-audit10-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod10b.so
>
> -$(objpfx)tst-sse: $(objpfx)tst-ssemod.so
> -$(objpfx)tst-avx: $(objpfx)tst-avx-aux.o $(objpfx)tst-avxmod.so
> -$(objpfx)tst-avx512: $(objpfx)tst-avx512-aux.o $(objpfx)tst-avx512mod.so
>
> -AVX-CFLAGS=3D-mavx -mno-vzeroupper
> -CFLAGS-tst-audit4-aux.c +=3D $(AVX-CFLAGS)
> -CFLAGS-tst-auditmod4a.c +=3D $(AVX-CFLAGS)
> -CFLAGS-tst-auditmod4b.c +=3D $(AVX-CFLAGS)
> -CFLAGS-tst-auditmod6b.c +=3D $(AVX-CFLAGS)
> -CFLAGS-tst-auditmod6c.c +=3D $(AVX-CFLAGS)
> -CFLAGS-tst-auditmod7b.c +=3D $(AVX-CFLAGS)
> -CFLAGS-tst-avx-aux.c +=3D $(AVX-CFLAGS)
> -CFLAGS-tst-avxmod.c +=3D $(AVX-CFLAGS)
> -AVX512-CFLAGS =3D -mavx512f
> -CFLAGS-tst-audit10-aux.c +=3D $(AVX512-CFLAGS)
> -CFLAGS-tst-auditmod10a.c +=3D $(AVX512-CFLAGS)
> -CFLAGS-tst-auditmod10b.c +=3D $(AVX512-CFLAGS)
> -CFLAGS-tst-avx512-aux.c +=3D $(AVX512-CFLAGS)
> -CFLAGS-tst-avx512mod.c +=3D $(AVX512-CFLAGS)
>
> -$(objpfx)tst-glibc-hwcaps: $(objpfx)libmarkermod2-1.so \
> -  $(objpfx)libmarkermod3-1.so $(objpfx)libmarkermod4-1.so
> -$(objpfx)tst-glibc-hwcaps.out: \
> -  $(objpfx)libmarkermod2.so \
>      $(objpfx)glibc-hwcaps/x86-64-v2/libmarkermod2.so \
> -  $(objpfx)libmarkermod3.so \
>      $(objpfx)glibc-hwcaps/x86-64-v2/libmarkermod3.so \
> -    $(objpfx)glibc-hwcaps/x86-64-v3/libmarkermod3.so \
> -  $(objpfx)libmarkermod4.so \
>      $(objpfx)glibc-hwcaps/x86-64-v2/libmarkermod4.so \
> +    $(objpfx)glibc-hwcaps/x86-64-v3/libmarkermod3.so \
>      $(objpfx)glibc-hwcaps/x86-64-v3/libmarkermod4.so \
>      $(objpfx)glibc-hwcaps/x86-64-v4/libmarkermod4.so \
> -
> +  $(objpfx)libmarkermod2.so \
> +  $(objpfx)libmarkermod3-1.so $(objpfx)libmarkermod4-1.so
> +  $(objpfx)libmarkermod3.so \
> +  $(objpfx)libmarkermod4.so \
> +  tst-plt-rewrite1 \
> +  tst-plt-rewrite2 \
> +  tst-rsi-strlen
> +# There is no good reason to use MMX in x86-64 ld.so with GCC.
> +# This is an ld.so.cache test, and RPATH/RUNPATH in the executable
> +# Turn off AVX512F and AVX2 so that GLRO(dl_platform) is
> +# always set to x86_64.
> +# interferes with its test objectives.
>  $(objpfx)glibc-hwcaps/x86-64-v2/libmarkermod2.so: $(objpfx)libmarkermod2=
-2.so
> -       $(make-target-directory)
> -       cp $< $@
>  $(objpfx)glibc-hwcaps/x86-64-v2/libmarkermod3.so: $(objpfx)libmarkermod3=
-2.so
> -       $(make-target-directory)
> -       cp $< $@
> -$(objpfx)glibc-hwcaps/x86-64-v3/libmarkermod3.so: $(objpfx)libmarkermod3=
-3.so
> -       $(make-target-directory)
> -       cp $< $@
>  $(objpfx)glibc-hwcaps/x86-64-v2/libmarkermod4.so: $(objpfx)libmarkermod4=
-2.so
> -       $(make-target-directory)
> -       cp $< $@
> +$(objpfx)glibc-hwcaps/x86-64-v3/libmarkermod3.so: $(objpfx)libmarkermod3=
-3.so
>  $(objpfx)glibc-hwcaps/x86-64-v3/libmarkermod4.so: $(objpfx)libmarkermod4=
-3.so
> -       $(make-target-directory)
> -       cp $< $@
>  $(objpfx)glibc-hwcaps/x86-64-v4/libmarkermod4.so: $(objpfx)libmarkermod4=
-4.so
> -       $(make-target-directory)
> -       cp $< $@
> -
> -ifeq (no,$(build-hardcoded-path-in-tests))
> -# This is an ld.so.cache test, and RPATH/RUNPATH in the executable
> -# interferes with its test objectives.
> -tests-container +=3D tst-glibc-hwcaps-cache
> +$(objpfx)ifuncmain8: $(objpfx)ifuncmod8.so
> +$(objpfx)tst-audit10.out: $(objpfx)tst-auditmod10b.so
> +$(objpfx)tst-audit10: $(objpfx)tst-audit10-aux.o $(objpfx)tst-auditmod10=
a.so
> +$(objpfx)tst-audit3.out: $(objpfx)tst-auditmod3b.so
> +$(objpfx)tst-audit3: $(objpfx)tst-auditmod3a.so
> +$(objpfx)tst-audit4.out: $(objpfx)tst-auditmod4b.so
> +$(objpfx)tst-audit4: $(objpfx)tst-audit4-aux.o $(objpfx)tst-auditmod4a.s=
o
> +$(objpfx)tst-audit5.out: $(objpfx)tst-auditmod5b.so
> +$(objpfx)tst-audit5: $(objpfx)tst-auditmod5a.so
> +$(objpfx)tst-audit6.out: $(objpfx)tst-auditmod6b.so \
> +$(objpfx)tst-audit6: $(objpfx)tst-auditmod6a.so
> +$(objpfx)tst-audit7.out: $(objpfx)tst-auditmod7b.so
> +$(objpfx)tst-audit7: $(objpfx)tst-auditmod7a.so
> +$(objpfx)tst-avx512: $(objpfx)tst-avx512-aux.o $(objpfx)tst-avx512mod.so
> +$(objpfx)tst-avx: $(objpfx)tst-avx-aux.o $(objpfx)tst-avxmod.so
> +$(objpfx)tst-glibc-hwcaps.out: \
> +$(objpfx)tst-glibc-hwcaps: $(objpfx)libmarkermod2-1.so \
> +$(objpfx)tst-platform-1.out: $(objpfx)x86_64/tst-platformmod-2.so
> +$(objpfx)tst-platform-1: $(objpfx)tst-platformmod-1.so
> +$(objpfx)tst-quad1: $(objpfx)tst-quadmod1.so
> +$(objpfx)tst-quad1pie: $(objpfx)tst-quadmod1pie.o
> +$(objpfx)tst-quad2: $(objpfx)tst-quadmod2.so
> +$(objpfx)tst-quad2pie: $(objpfx)tst-quadmod2pie.o
> +$(objpfx)tst-sse: $(objpfx)tst-ssemod.so
> +AVX-CFLAGS=3D-mavx -mno-vzeroupper
> +AVX512-CFLAGS =3D -mavx512f
> +CFLAGS-.os +=3D $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routine=
s))),\
> +CFLAGS-tst-audit10-aux.c +=3D $(AVX512-CFLAGS)
> +CFLAGS-tst-audit4-aux.c +=3D $(AVX-CFLAGS)
> +CFLAGS-tst-auditmod10a.c +=3D $(AVX512-CFLAGS)
> +CFLAGS-tst-auditmod10b.c +=3D $(AVX512-CFLAGS)
> +CFLAGS-tst-auditmod4a.c +=3D $(AVX-CFLAGS)
> +CFLAGS-tst-auditmod4b.c +=3D $(AVX-CFLAGS)
> +CFLAGS-tst-auditmod6b.c +=3D $(AVX-CFLAGS)
> +CFLAGS-tst-auditmod6c.c +=3D $(AVX-CFLAGS)
> +CFLAGS-tst-auditmod7b.c +=3D $(AVX-CFLAGS)
> +CFLAGS-tst-avx-aux.c +=3D $(AVX-CFLAGS)
> +CFLAGS-tst-avx512-aux.c +=3D $(AVX512-CFLAGS)
> +CFLAGS-tst-avx512mod.c +=3D $(AVX512-CFLAGS)
> +CFLAGS-tst-avxmod.c +=3D $(AVX-CFLAGS)
> +CFLAGS-tst-platform-1.c =3D -mno-avx
> +CFLAGS-tst-platformmod-1.c =3D -mno-avx
> +CFLAGS-tst-platformmod-2.c =3D -mno-avx
> +CFLAGS-tst-quad1pie.c =3D $(PIE-ccflag)
> +CFLAGS-tst-quad2pie.c =3D $(PIE-ccflag)
> +LDFLAGS-tst-platformmod-2.so =3D -Wl,-soname,tst-platformmod-2.so
> +LDFLAGS-tst-split-dynreloc =3D -Wl,-T,$(..)sysdeps/x86_64/tst-split-dynr=
eloc.lds
>  endif
> -
> +endif
> +endif
> +extra-test-objs +=3D tst-audit4-aux.o tst-audit10-aux.o \
> +extra-test-objs +=3D tst-platformmod-2.o
> +extra-test-objs +=3D tst-quadmod1pie.o tst-quadmod2pie.o
> +ifeq ($(have-insert),yes)
> +ifeq ($(subdir),elf)
> +ifeq (no,$(build-hardcoded-path-in-tests))
>  ifeq (yes,$(have-z-mark-plt))
> +modules-names +=3D ifuncmod8
> +modules-names +=3D tst-auditmod3a tst-auditmod3b \
> +modules-names +=3D tst-platformmod-1 x86_64/tst-platformmod-2
> +modules-names +=3D tst-quadmod1 tst-quadmod2
> +quad-pie-test +=3D tst-quad1pie tst-quad2pie
> +sysdep-dl-routines +=3D tlsdesc dl-tlsdesc tls_get_addr
> +test-extras +=3D tst-audit4-aux tst-audit10-aux \
> +test-extras +=3D tst-quadmod1pie tst-quadmod2pie
> +tests +=3D $(quad-pie-test)
>  tests +=3D \
> -  tst-plt-rewrite1 \
> -  tst-plt-rewrite2 \
> +tests +=3D ifuncmain8
> +tests +=3D tst-audit3 tst-audit4 tst-audit5 tst-audit6 tst-audit7 \
> +tests +=3D tst-platform-1
> +tests +=3D tst-quad1 tst-quad2
> +tests +=3D tst-split-dynreloc
> +tests-container +=3D tst-glibc-hwcaps-cache
> +tests-pie +=3D $(quad-pie-test)
> +tst-audit10-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod10b.so
> +tst-audit3-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod3b.so
> +tst-audit4-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod4b.so
> +tst-audit5-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod5b.so
> +tst-audit6-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod6b.so:$(objpfx)tst-au=
ditmod6c.so
> +tst-audit7-ENV =3D LD_AUDIT=3D$(objpfx)tst-auditmod7b.so
> +tst-platform-1-ENV =3D LD_PRELOAD=3D$(objpfx)\$$PLATFORM/tst-platformmod=
-2.so \
> +tst-split-dynreloc-ENV =3D LD_BIND_NOW=3D1
>  # tests
>  modules-names +=3D \
>    tst-plt-rewritemod1 \
> @@ -230,14 +230,14 @@ sysdep_routines +=3D \
>  # sysdep_routines
>
>  tests +=3D \
> -  tst-rsi-wcslen
> -endif
>
>
> +  tst-rsi-wcslen
> +  tst-setjmp-cet \
> +endif
>  ifeq ($(subdir),setjmp)
>  ifneq ($(enable-cet),no)
>  tests +=3D \
> -  tst-setjmp-cet \
>  # tests
>  tst-setjmp-cet-ENV =3D GLIBC_TUNABLES=3Dglibc.cpu.x86_ibt=3Don:glibc.cpu=
.x86_shstk=3Don
>  endif
> @@ -250,6 +250,10 @@ sysdep-dl-routines +=3D dl-cet
>
>  tests +=3D \
>    tst-cet-legacy-1 \
> +  tst-cet-legacy-10 \
> +  tst-cet-legacy-10-static \
> +  tst-cet-legacy-10a \
> +  tst-cet-legacy-10a-static \
>    tst-cet-legacy-1a \
>    tst-cet-legacy-2 \
>    tst-cet-legacy-2a \
> @@ -261,15 +265,11 @@ tests +=3D \
>    tst-cet-legacy-8 \
>    tst-cet-legacy-9 \
>    tst-cet-legacy-9-static \
> -  tst-cet-legacy-10 \
> -  tst-cet-legacy-10-static \
> -  tst-cet-legacy-10a \
> -  tst-cet-legacy-10a-static \
>  # tests
>  tests-static +=3D \
> -  tst-cet-legacy-9-static \
>    tst-cet-legacy-10-static \
>    tst-cet-legacy-10a-static \
> +  tst-cet-legacy-9-static \
>  # tests-static
>  tst-cet-legacy-1a-ARGS =3D -- $(host-test-program-cmd)
>
> diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/m=
ultiarch/Makefile
> index ea81753b70..e1a490dd98 100644
> --- a/sysdeps/x86_64/fpu/multiarch/Makefile
> +++ b/sysdeps/x86_64/fpu/multiarch/Makefile
> @@ -4,10 +4,10 @@ libm-sysdep_routines +=3D \
>    s_ceilf-c \
>    s_floor-c \
>    s_floorf-c \
> -  s_rint-c \
> -  s_rintf-c \
>    s_nearbyint-c \
>    s_nearbyintf-c \
> +  s_rint-c \
> +  s_rintf-c \
>    s_roundeven-c \
>    s_roundevenf-c \
>    s_trunc-c \
> @@ -21,10 +21,10 @@ libm-sysdep_routines +=3D \
>    s_floorf-sse4_1 \
>    s_nearbyint-sse4_1 \
>    s_nearbyintf-sse4_1 \
> -  s_roundeven-sse4_1 \
> -  s_roundevenf-sse4_1 \
>    s_rint-sse4_1 \
>    s_rintf-sse4_1 \
> +  s_roundeven-sse4_1 \
> +  s_roundevenf-sse4_1 \
>    s_trunc-sse4_1 \
>    s_truncf-sse4_1 \
>  # libm-sysdep_routines
> @@ -84,12 +84,12 @@ CFLAGS-s_cosf-fma.c =3D -mfma -mavx2
>  CFLAGS-s_sincosf-fma.c =3D -mfma -mavx2
>
>  libm-sysdep_routines +=3D \
> +  e_asin-fma4 \
> +  e_atan2-fma4 \
>    e_exp-fma4 \
>    e_log-fma4 \
>    e_pow-fma4 \
> -  e_asin-fma4 \
>    s_atan-fma4 \
> -  e_atan2-fma4 \
>    s_sin-fma4 \
>    s_sincos-fma4 \
>    s_tan-fma4 \
> @@ -106,10 +106,10 @@ CFLAGS-s_tan-fma4.c =3D -mfma4
>  CFLAGS-s_sincos-fma4.c =3D -mfma4
>
>  libm-sysdep_routines +=3D \
> +  e_atan2-avx \
>    e_exp-avx \
>    e_log-avx \
>    s_atan-avx \
> -  e_atan2-avx \
>    s_sin-avx \
>    s_sincos-avx \
>    s_tan-avx \
> diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch=
/Makefile
> index e1e894c963..d3d2270394 100644
> --- a/sysdeps/x86_64/multiarch/Makefile
> +++ b/sysdeps/x86_64/multiarch/Makefile
> @@ -4,8 +4,8 @@ sysdep_routines +=3D \
>    memchr-avx2 \
>    memchr-avx2-rtm \
>    memchr-evex \
> -  memchr-evex512 \
>    memchr-evex-rtm \
> +  memchr-evex512 \
>    memchr-sse2 \
>    memcmp-avx2-movbe \
>    memcmp-avx2-movbe-rtm \
> @@ -37,8 +37,8 @@ sysdep_routines +=3D \
>    rawmemchr-avx2 \
>    rawmemchr-avx2-rtm \
>    rawmemchr-evex \
> -  rawmemchr-evex512 \
>    rawmemchr-evex-rtm \
> +  rawmemchr-evex512 \
>    rawmemchr-sse2 \
>    stpcpy-avx2 \
>    stpcpy-avx2-rtm \
> --
> 2.43.0
>


--=20
H.J.