From: Sunil Pandey <skpgkp2@gmail.com>
To: "H.J. Lu" <hjl.tools@gmail.com>
Cc: libc-stable@sourceware.org, fweimer@redhat.com
Subject: Re: [2.39 Backport 1/2] Apply the Makefile sorting fix
Date: Mon, 15 Apr 2024 09:59:55 -0700 [thread overview]
Message-ID: <CAMAf5_c6opE8LYaTyq01r9S_86mRa385DZGXD_j3sPRjbWh7DQ@mail.gmail.com> (raw)
In-Reply-To: <20240414123914.2130945-1-hjl.tools@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 6928 bytes --]
On Sun, Apr 14, 2024 at 5:39 AM H.J. Lu <hjl.tools@gmail.com> wrote:
> Apply the Makefile sorting fix generated by sort-makefile-lines.py.
>
> (cherry picked from commit ef7f4b1fef67430a8f3cfc77fa6aada2add851d7)
> ---
> sysdeps/loongarch/lp64/multiarch/Makefile | 80 +++++++++++------------
> sysdeps/x86/Makefile | 6 +-
> sysdeps/x86_64/Makefile | 10 +--
> sysdeps/x86_64/fpu/multiarch/Makefile | 14 ++--
> sysdeps/x86_64/multiarch/Makefile | 4 +-
> 5 files changed, 57 insertions(+), 57 deletions(-)
>
> diff --git a/sysdeps/loongarch/lp64/multiarch/Makefile
> b/sysdeps/loongarch/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 += \
> - 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 992aabe43e..5311b594af 100644
> --- a/sysdeps/x86/Makefile
> +++ b/sysdeps/x86/Makefile
> @@ -15,18 +15,18 @@ CFLAGS-dl-get-cpu-features.os += $(rtld-early-cflags)
> CFLAGS-get-cpuid-feature-leaf.o += $(no-stack-protector)
>
> tests += \
> - 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 += \
> - 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 9d374a3299..0ede447405 100644
> --- a/sysdeps/x86_64/Makefile
> +++ b/sysdeps/x86_64/Makefile
> @@ -252,6 +252,10 @@ sysdep-dl-routines += dl-cet
>
> tests += \
> 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 \
> @@ -263,15 +267,11 @@ tests += \
> 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 += \
> - 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 = -- $(host-test-program-cmd)
>
> diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile
> b/sysdeps/x86_64/fpu/multiarch/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 += \
> 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 += \
> 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 = -mfma -mavx2
> CFLAGS-s_sincosf-fma.c = -mfma -mavx2
>
> libm-sysdep_routines += \
> + 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 = -mfma4
> CFLAGS-s_sincos-fma4.c = -mfma4
>
> libm-sysdep_routines += \
> + 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 += \
> 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 += \
> rawmemchr-avx2 \
> rawmemchr-avx2-rtm \
> rawmemchr-evex \
> - rawmemchr-evex512 \
> rawmemchr-evex-rtm \
> + rawmemchr-evex512 \
> rawmemchr-sse2 \
> stpcpy-avx2 \
> stpcpy-avx2-rtm \
> --
> 2.44.0
>
> LGTM
prev parent reply other threads:[~2024-04-15 17:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-14 12:39 H.J. Lu
2024-04-14 12:39 ` [2.39 Backport 2/2] x86_64: Exclude SSE, AVX and FMA4 variants in libm multiarch H.J. Lu
2024-04-15 17:01 ` Sunil Pandey
2024-04-15 16:59 ` Sunil Pandey [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMAf5_c6opE8LYaTyq01r9S_86mRa385DZGXD_j3sPRjbWh7DQ@mail.gmail.com \
--to=skpgkp2@gmail.com \
--cc=fweimer@redhat.com \
--cc=hjl.tools@gmail.com \
--cc=libc-stable@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).