From patchwork Thu Feb 15 19:20:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 85835 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 201A2386C58F for ; Thu, 15 Feb 2024 19:20:47 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by sourceware.org (Postfix) with ESMTPS id 8801B384B046 for ; Thu, 15 Feb 2024 19:20:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8801B384B046 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 8801B384B046 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708024825; cv=none; b=BSHS0IYxDugW0s5kVA79Ct/bPt9Dyp/I0rLlE8sF9ETMfq1iaL6Cf9O4ggufFux9IYWv1fmGy7NAfxZbe5S9osP3ANRI1/sUfdsLPqWJGpYdFJiTt+qCIHBYKiTQws4LD8z3lgX48HUPlJWMQ1oH+NM5eBZA0MfiIOaHYEd6xtI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708024825; c=relaxed/simple; bh=9DsaURmqhGPEd7vJs2SeRXI3WFMlDCXCZBY0PBG68MQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=RKFBDfZSxpVYvt9Sff3TYp+KN8tM4H0cY2S0txzjEc/r8+LRyxmC7bmiwejbaYZO3pjXbqhkoew8yCUoOnsyb7+1OURVOO1ojUhk5aTJTpBChAc+YrWalQop/GOP7kJTocLSklZZXY0GgCcYV8Oac06tX7djMX4vm9kEO9QpgZw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1d918008b99so9973525ad.3 for ; Thu, 15 Feb 2024 11:20:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708024822; x=1708629622; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=VCMykC3qnsy7pdbfh2QVH8xJt9Ec3sms/wncCL2kdLI=; b=OQsXs+GTcbf67nJjF/WIzpvC1ET86Tpvo1UxDX4/RX86rW+i8yOwdurRQJCS8kNGxv FOCp90xX/fAD+el0lfX7tqidrye1xyLqQ+JE5ErX3aRhiqggbwFMSPyRDdiZkZX8qXj2 RgGV/yth9druV2rSMMkqU6cjN6rpMLQRMQdl95a69MBzNvNc9Olto+Ti+g4LQWwnWyYr 8L4gARbHuDuIuA+wXqhXhCz6BRIdrSJl5AGQmfeBcxCEhKuxW4upZRFUemxgAcb5Tpkt glBOEcW90XUjBfJwZJpx9YaEaOGoz2tGUgpuI1vKhpUQOzUEkogL3iWUT/nCzgFLGw7T S57A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708024822; x=1708629622; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VCMykC3qnsy7pdbfh2QVH8xJt9Ec3sms/wncCL2kdLI=; b=ixykFXYP9XKKycJYlR9uGu4NDsfBAWb3TelidZaShZ+N9LkjgMwn0a+wBT33UiZtsI hVfLPXUcS1mN93Zunt/vCcHyWakW1WftfAw4MQDxaoKDE5203OT1ZQzVzin15MCkPM51 itXUe89rkX1/Vlm5JyH+o1Jz5h/roovHJBB2OfwdBqH6sWqbYzpxzK4eJGuzTba3T6Ql cUQOclQD3YXSGJ3QzjIfnFP0K2xPUBoG0bL/Nkr1ieQyYvLyRokjVy+2vDCn+57i6eEx TgAx1UOXF2btep3+gzlOAzDjAW2vQsb5h8oRhkBZntz5XwOGWVC/oHxSI9B75aHaj/m/ Fceg== X-Gm-Message-State: AOJu0YydcenNtXjYly0aLq6qMAcSe8eD0H3z2LzjuxJ78FaGd+DON6jV 1fT8uLTFnJBpO4Eb16NHzVm054OwnlBWr+oi/UHEz1OsU5UO8vDAT6iyCqX2 X-Google-Smtp-Source: AGHT+IHUQFZQjVtDDuUywCryT+nOTHJrSoyTZuSIGi+Kk5LSV1w3MOnoqNN+3N4iqDyoka3u/dwikg== X-Received: by 2002:a17:902:9347:b0:1db:95f0:4876 with SMTP id g7-20020a170902934700b001db95f04876mr1617475plp.68.1708024822219; Thu, 15 Feb 2024 11:20:22 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.58.89.72]) by smtp.gmail.com with ESMTPSA id 12-20020a170902c20c00b001db6da30331sm1618339pll.86.2024.02.15.11.20.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 11:20:21 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id D49D8740376 for ; Thu, 15 Feb 2024 11:20:20 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Subject: [PATCH v2] Apply the Makefile sorting fix Date: Thu, 15 Feb 2024 11:20:20 -0800 Message-ID: <20240215192020.2484727-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3019.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org 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/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 4d50b327b5..73b29cc78c 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 524a15f3bb..145f25e7f6 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 \