From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-xb33.google.com (mail-yb1-xb33.google.com [IPv6:2607:f8b0:4864:20::b33]) by sourceware.org (Postfix) with ESMTPS id D3AD2386D61D for ; Thu, 15 Feb 2024 19:42:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D3AD2386D61D 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 D3AD2386D61D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::b33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708026178; cv=none; b=xuG9XaPqyrNcEDPHSRLhRksgXRDwDVeYa5CDYwB2fCSvAXt8j6MyaxhRUelfkNX/IZOcogkB+BAlmkWKsELvQXd5kEYzBIVT4CrUTorwE0CRd+onigIzH0Z3+r0HkMZLBhuRYfPwR6nDdmpFYfQVD0bw+39lH26w38mi8n+OzYo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708026178; c=relaxed/simple; bh=BvCJJg2LmTEFSpHl+ERMu6PrHaZPdcN7WGlHeNEJL/U=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=OWph0VqhOcaPmjb27V1dZUSyVNJHkT3qBLVdrb2drDuQral7BO+ZqB4H6Vgv22ydzIs+GddLbNyxjV5utFq5ozOub+tcu9uUP+GFQp3khCMMQzf/+xOfweEqvuDlS6xN6hQ6pUsn7tUcaNnveJ6XaLp95ZjyVLDim3k5ZByLhBI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yb1-xb33.google.com with SMTP id 3f1490d57ef6-dbed0710c74so1140614276.1 for ; Thu, 15 Feb 2024 11:42:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708026176; x=1708630976; 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=B/C//wj3X1v4fzap0N1ZHAYRwPNvrUwhLRRxBXIZ/pM=; b=DpbFvjDThSP8ahaZgygWHM/FE/c6K4ZlS7EgehWa5Yyl183e8ttub2rWOBp8KkcJoy b8AnwWkICdEAM2/CGTHKXPGvYZungK2DTta3QxrH56kiU3kQ8HQMmuf3sodSG1AeoIPj HmDdIK9l2/YaD396wSIwW+Tvokiq0XMX31mr2+0hrjhY9+xBogFZiUwkx0HAH1W8G7mw sSKNmm3ENQO9Z4kNIpBuSPraxA+OpiMmzU80eJ/qRC1xpc2/5zxT3jYovK6GSbTdpXHP ZxwC6Y9NLaExl6rXpYEoxE5cOHSOtKHwGEhuXkbXqlugbt2QInMjhUipbA20fwYw4f9d RdaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708026176; x=1708630976; 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=B/C//wj3X1v4fzap0N1ZHAYRwPNvrUwhLRRxBXIZ/pM=; b=qMnxeJ4wac2LzwRkiPrRYy8Ac5xcFM/1k9BuADESjkRGN0OG177Uew23arASaWxvUz 0n9ljQ7JXxAd+kBlg91I5pzZ71GJ1AwJOf4w6pXrC5h2H9OqnjmzqH6KlX5p76L74lWv cs2Hv2tpoPv61zCk5lPyrRmcDvQSou442psxKpOxCfdyaNZyH8IShsaw3VQiGfoSgYQc 0er8sAuHdE6NuDpgWtaV6Cw0zL3kvRDBnIWhkmnkB2yn0x9LatyZfNEOKpPWss8GZ9TJ HWL/yqNuTvyK7t67vV3y5sJiuZ7105XPrmS0g1kgQxbp9QwdpOO2CHVapIiXhGgLb7sI gsqQ== X-Gm-Message-State: AOJu0YyQmq0jWGiNIsWrOfw4INbl+rK/UKZRWkitu9orke2fuPGHp5qN seR8zojdbn6/SJhEXH8EfkCtRId5hUpVk0juojAXLNy6z8dTNBbWzUV+cCU2stTQ1cxmudNdk8J d+MKURDXP+qlgF8Ue/sFA3iXPf4iNN8rn X-Google-Smtp-Source: AGHT+IGTLZ8TjZBSxsOkQgshlgBqqsCDushpPsVzVy79i44CtNH1umAF+JtAt1lH9yfHbuWqHnXd6w4K2BHCLe/7/AQ= X-Received: by 2002:a05:6902:1ac2:b0:dcb:e0dc:67ee with SMTP id db2-20020a0569021ac200b00dcbe0dc67eemr3245651ybb.45.1708026176136; Thu, 15 Feb 2024 11:42:56 -0800 (PST) MIME-Version: 1.0 References: <20240215192020.2484727-1-hjl.tools@gmail.com> In-Reply-To: <20240215192020.2484727-1-hjl.tools@gmail.com> From: "H.J. Lu" Date: Thu, 15 Feb 2024 11:42:19 -0800 Message-ID: Subject: Re: [PATCH v2] 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.1 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: On Thu, Feb 15, 2024 at 11:20=E2=80=AFAM H.J. Lu 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 | 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/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 524a15f3bb..145f25e7f6 100644 > --- a/sysdeps/x86_64/Makefile > +++ b/sysdeps/x86_64/Makefile > @@ -252,6 +252,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 \ > @@ -263,15 +267,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 > I am checking it in. --=20 H.J.