From patchwork Thu Feb 24 21:05: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: 1597351 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=shM5rl9m; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K4QRw5KPFz9sFN for ; Fri, 25 Feb 2022 08:06:04 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 38016385841F for ; Thu, 24 Feb 2022 21:06:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 38016385841F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1645736762; bh=YRvYfNTY5I3ApoPXedO5qZS0gKDLGjWcpK4uqOcKlMc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=shM5rl9mZU4nrRstNhCg0lZuYFxP/P3uLPoHylrvjJCopFwu5ew7Z2pX4UY2daHjU CNNx8Af9oXAGdjwc8mNbMcL8WrYGCmpILv6Nzx8AzTq+q7GeKN/1onP43atzXJAyQR D1JT888htuPXPHm8GPDSJrfVcAj9+9ppNwmGk7w8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id 6BE9E3858414 for ; Thu, 24 Feb 2022 21:05:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6BE9E3858414 Received: by mail-pl1-x636.google.com with SMTP id c9so2974973pll.0 for ; Thu, 24 Feb 2022 13:05:48 -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=YRvYfNTY5I3ApoPXedO5qZS0gKDLGjWcpK4uqOcKlMc=; b=hCWTI3m58lBUBu8crRJ5p2WJjM6p9JRZvwP2ikLS7Of6F8/Yo/20Arw213uPTynQyB jOeFdy+J2Q0LWLagll9GU2YDMe2cWcvHqgjvTT300mH1ni/NXFVeDhXhmNzDfWug4Fnq rIj4O+3Nf3X6wH/m6gc0A0o2LhuQrUKrw/tB5V7FboLWgq71JdPofIRKBq4rrV2DEAgP 0Di15PoH6bK2hHOiuM0RFJrlAnzaB+M2XhmlY5Udxp4kXuLb38z/PkIowZkBZReLUvZZ glT9suq4+JmdBshWKm9le5zX8W+TmmqCqfDqm40cRBW0b9gpTshqXT3WY5tWp3GRAgys YzPQ== X-Gm-Message-State: AOAM533cuf8bNlSHWy0RDlSlr+viAF9D9ERwNDsqt5yifI71dbpgViUa ApHW3OZU3ah7JUoOHlqKM1ifk6Y177s= X-Google-Smtp-Source: ABdhPJwyDc4JZie7pM+7H/e9JhDLuc6y8hLD3VS7RaQLavWn6HPS5nzEEDrKsuD/gGymef2IsyyqsA== X-Received: by 2002:a17:902:6acb:b0:150:c60:294a with SMTP id i11-20020a1709026acb00b001500c60294amr4569529plt.71.1645736747235; Thu, 24 Feb 2022 13:05:47 -0800 (PST) Received: from gnu-gram-1.localdomain ([172.58.35.88]) by smtp.gmail.com with ESMTPSA id y7-20020a655b47000000b00373ec9fcb06sm415131pgr.27.2022.02.24.13.05.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 13:05:46 -0800 (PST) Received: from gnu-gram-1.. (localhost [IPv6:::1]) by gnu-gram-1.localdomain (Postfix) with ESMTP id 7B7F1100074 for ; Thu, 24 Feb 2022 13:05:45 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] build: Properly generate .d dependency files [BZ #28922] Date: Thu, 24 Feb 2022 13:05:45 -0800 Message-Id: <20220224210545.2036071-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.2 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+incoming=patchwork.ozlabs.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. --- 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/Makefile | 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/Makefile b/sysdeps/x86_64/fpu/Makefile index 8278ce104a..2d1ab9e468 100644 --- a/sysdeps/x86_64/fpu/Makefile +++ b/sysdeps/x86_64/fpu/Makefile @@ -37,6 +37,12 @@ tests += \ $(libmvec-abi-func-avx2-tests) \ $(libmvec-abi-func-avx512f-tests) +extra-test-objs += \ + test-libmvec.o \ + test-libmvec-avx.o \ + test-libmvec-avx2.o \ + test-libmvec-avx512f.o + double-vlen2-funcs = $(libmvec-funcs) double-vlen4-funcs = $(libmvec-funcs) double-vlen4-avx2-funcs = $(libmvec-funcs)