diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2022-02-24 14:10:45 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2022-02-25 10:35:45 -0800 |
| commit | 1fe00d3eb602a0754873b536dc92fb6226759ee4 (patch) | |
| tree | 9ac924ea02427b8d752cea8269e1e011d8cac452 | |
| parent | c12c2a41b0bf626f50265e67d3393e1607c9cc77 (diff) | |
| download | glibc-1fe00d3eb602a0754873b536dc92fb6226759ee4.zip glibc-1fe00d3eb602a0754873b536dc92fb6226759ee4.tar.gz glibc-1fe00d3eb602a0754873b536dc92fb6226759ee4.tar.bz2 | |
build: Properly generate .d dependency files [BZ #28922]
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 <carlos@redhat.com>
| -rw-r--r-- | Makerules | 1 | ||||
| -rw-r--r-- | elf/Makefile | 3 | ||||
| -rw-r--r-- | iconv/Makefile | 1 | ||||
| -rw-r--r-- | malloc/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/x86_64/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/fpu/Makeconfig | 6 |
7 files changed, 17 insertions, 1 deletions
@@ -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 bff9495..281551d 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 5aeed34..a0d90cf 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 2329cf7..4e32de2 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 7122f55..ca95380 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 7a4b576..79365af 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 30b8d97..5c03b1d 100644 --- a/sysdeps/x86_64/fpu/Makeconfig +++ b/sysdeps/x86_64/fpu/Makeconfig @@ -113,6 +113,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 \ echo "\$$(objpfx)$$t$$i: \\"; \ |