From patchwork Thu Feb 24 22:10:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 51379 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 443E7385843B for ; Thu, 24 Feb 2022 22:11:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 443E7385843B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1645740706; bh=L4vEv1V1d99fwZK2C2V5hj0jbTctZOrQ2KsJNvy1Olk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=oWAxgn6/m7ytM/JuJksSsEf2yt7ifYIESHSoTeqFHJ2G8z5jwzH8zQILTHS1OgyYy d9FMR9yawB5QWt4garqrhb8AzbtwLCFyvQZ9ZnlFRSS4vd2oCXCLdLrMyTR0eoHyEx IsGYMYzUeuq4eexSDopNdHTPZctO5cYXHU9K90wI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id E165F385803F for ; Thu, 24 Feb 2022 22:10:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E165F385803F Received: by mail-pl1-x62c.google.com with SMTP id ay5so264183plb.1 for ; Thu, 24 Feb 2022 14:10:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=L4vEv1V1d99fwZK2C2V5hj0jbTctZOrQ2KsJNvy1Olk=; b=dm7ZH7J78PcLkBcYhwLijSp52MRfGb5vrrIrfLMstmOIHgqP+AGlbYZfpzJfoxUWl8 D8yroL+zpYhK5zyeA3VjAq03NA2vDfhQMs/6Bs6U/+QQ76eeqXXyUSlQodP+6gxoZYyg kI4t1SX82wqCgfu4xqjBn/CwZjI4PaDN18nsDj3EH5X/faXBqVl1wIHvNrn/4tYBnmOO 5udZvh6LFKL6Ye+eSCUBCHlgPF2jYD26cOtUJGcLu3ma76Pfn2KZ6hugvCqO9ZvJ877P h2mD5r8jsWzQJt1TSBOcea/og+iEfMSgJkPtBrp+f0o+cQ5/NtLM+AI0udEYSk7xPbPF qgSw== X-Gm-Message-State: AOAM5335cLpVcUpUz6LsBCIXXFm3nNeIJZhLxHrYxppd14JXMt/gk7// 5/WBcyWieJ3z1SbbK7Fm6t2M2XoIrRs= X-Google-Smtp-Source: ABdhPJygutKRfpP6yWFSbVl2GNCVq4coyThp5pl7cfsP5UtiBjeDEf293AmXaOtSI8f/o7i6r3fI/w== X-Received: by 2002:a17:902:bc82:b0:14f:2b9c:4aa with SMTP id bb2-20020a170902bc8200b0014f2b9c04aamr4359315plb.145.1645740646808; Thu, 24 Feb 2022 14:10:46 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.88]) by smtp.gmail.com with ESMTPSA id lb4-20020a17090b4a4400b001b9b20eabc4sm299864pjb.5.2022.02.24.14.10.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 14:10:46 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 3E500C0375 for ; Thu, 24 Feb 2022 14:10:45 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2] build: Properly generate .d dependency files [BZ #28922] Date: Thu, 24 Feb 2022 14:10:45 -0800 Message-Id: <20220224221045.987117-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.3 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 1. Also generate .d dependency files for $(tests-container) and $(tests-printers). 2. elf: Add tst-auditmod17.os to extra-test-objs. 3. iconv: Add tst-gconv-init-failure-mod.os to extra-test-objs. 4. malloc: Rename extra-tests-objs to extra-test-objs. 5. linux: Add tst-sysconf-iov_max-uapi.o to extra-test-objs. 6. x86_64: Add tst-x86_64mod-1.o, tst-platformmod-2.o, test-libmvec.o, test-libmvec-avx.o, test-libmvec-avx2.o and test-libmvec-avx512f.o to extra-test-objs. Reviewed-by: Carlos O'Donell --- Makerules | 1 + elf/Makefile | 3 +++ iconv/Makefile | 1 + malloc/Makefile | 2 +- sysdeps/unix/sysv/linux/Makefile | 3 +++ sysdeps/x86_64/Makefile | 2 ++ sysdeps/x86_64/fpu/Makeconfig | 6 ++++++ 7 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makerules b/Makerules index 5de2cec6be..428464f092 100644 --- a/Makerules +++ b/Makerules @@ -770,6 +770,7 @@ endif $(patsubst %.oS,%.d,$(filter %.oS,$(extra-objs))) \ $(patsubst %.o,%.d,$(filter %.o,$(extra-test-objs:.os=.o))) \ $(addsuffix .d,$(tests) $(tests-internal) $(xtests) \ + $(tests-container) $(tests-printers) \ $(test-srcs) $(tests-time64) $(xtests-time64)) ifeq ($(build-programs),yes) +depfiles += $(addsuffix .d,$(others) $(sysdep-others)) diff --git a/elf/Makefile b/elf/Makefile index bff94954c9..281551d380 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -888,6 +888,9 @@ modules-names += \ modules-names-tests = $(filter-out ifuncmod% tst-tlsmod%,\ $(modules-names)) +# For +depfiles in Makerules. +extra-test-objs += tst-auditmod17.os + ifeq (yes,$(have-mtls-dialect-gnu2)) tests += tst-gnu2-tls1 modules-names += tst-gnu2-tls1mod diff --git a/iconv/Makefile b/iconv/Makefile index 5aeed346ef..a0d90cfeac 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -86,6 +86,7 @@ ifeq (yes,$(build-shared)) tests += tst-gconv-init-failure modules-names += tst-gconv-init-failure-mod modules-names-tests += tst-gconv-init-failure-mod +extra-test-objs += tst-gconv-init-failure-mod.os $(objpfx)tst-gconv-init-failure-mod.so: $(libsupport) $(objpfx)tst-gconv-init-failure.out: \ $(objpfx)gconv-modules $(objpfx)tst-gconv-init-failure-mod.so diff --git a/malloc/Makefile b/malloc/Makefile index 2329cf718a..4e32de2a0b 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -145,7 +145,7 @@ extra-libs = libmemusage libc_malloc_debug extra-libs-others = $(extra-libs) # Helper objects for some tests. -extra-tests-objs += \ +extra-test-objs += \ tst-interpose-aux-nothread.o \ tst-interpose-aux-thread.o \ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 7122f55975..ca953804d0 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -128,6 +128,9 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tst-epoll \ # tests +# For +depfiles in Makerules. +extra-test-objs += tst-sysconf-iov_max-uapi.o + # Test for the symbol version of fcntl that was replaced in glibc 2.28. ifeq ($(have-GLIBC_2.27)$(build-shared),yesyes) tests += tst-ofdlocks-compat diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index 7a4b576356..79365aff2a 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -52,6 +52,7 @@ CFLAGS-tst-quad2pie.c = $(PIE-ccflag) tests += tst-x86_64-1 modules-names += x86_64/tst-x86_64mod-1 +extra-test-objs += tst-x86_64mod-1.o LDFLAGS-tst-x86_64mod-1.so = -Wl,-soname,tst-x86_64mod-1.so ifneq (no,$(have-tunables)) # Test the state size for XSAVE when XSAVEC is disabled. @@ -63,6 +64,7 @@ $(objpfx)tst-x86_64-1: $(objpfx)x86_64/tst-x86_64mod-1.so ifneq (no,$(have-tunables)) tests += tst-platform-1 modules-names += tst-platformmod-1 x86_64/tst-platformmod-2 +extra-test-objs += tst-platformmod-2.o CFLAGS-tst-platform-1.c = -mno-avx CFLAGS-tst-platformmod-1.c = -mno-avx CFLAGS-tst-platformmod-2.c = -mno-avx diff --git a/sysdeps/x86_64/fpu/Makeconfig b/sysdeps/x86_64/fpu/Makeconfig index 30b8d97826..5c03b1dbb8 100644 --- a/sysdeps/x86_64/fpu/Makeconfig +++ b/sysdeps/x86_64/fpu/Makeconfig @@ -112,6 +112,12 @@ libmvec-abi-func-avx512f-tests = \ $(common-objpfx)libmvec.mk: $(common-objpfx)config.make (echo "ifeq (\$$(subdir)\$$(build-mathvec),mathyes)"; \ + echo; \ + echo "extra-test-objs += \\"; \ + for i in "" "-avx" "-avx2" "-avx512f"; do \ + echo " test-libmvec$$i.o \\"; \ + done; \ + echo "# extra-test-objs"; \ echo; \ for i in "" "-avx" "-avx2" "-avx512f"; do \ for t in $(libmvec-abi-func-tests); do \