abe59f
commit 7de01e60c200c431d3469deb784da8fd4508fc15
abe59f
Author: Florian Weimer <fweimer@redhat.com>
abe59f
Date:   Fri Jan 14 20:16:05 2022 +0100
abe59f
abe59f
    elf/Makefile: Reflow and sort most variable assignments
abe59f
    
abe59f
    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
abe59f
abe59f
Conflicts:
abe59f
	elf/Makefile
abe59f
		Complete rewrite of reflow.
abe59f
abe59f
diff --git a/elf/Makefile b/elf/Makefile
abe59f
index 53faca4585220048..954cd08c199f5037 100644
abe59f
--- a/elf/Makefile
abe59f
+++ b/elf/Makefile
abe59f
@@ -21,20 +21,60 @@ subdir		:= elf
abe59f
 
abe59f
 include ../Makeconfig
abe59f
 
abe59f
-headers		= elf.h bits/elfclass.h link.h bits/link.h bits/link_lavcurrent.h
abe59f
-routines	= $(all-dl-routines) dl-support dl-iteratephdr \
abe59f
-		  dl-addr dl-addr-obj enbl-secure dl-profstub \
abe59f
-		  dl-origin dl-libc dl-sym dl-sysdep dl-error \
abe59f
-		  dl-reloc-static-pie libc_early_init
abe59f
+headers	= \
abe59f
+  bits/elfclass.h \
abe59f
+  bits/link.h \
abe59f
+  bits/link_lavcurrent.h \
abe59f
+  elf.h \
abe59f
+  link.h \
abe59f
+  # headers
abe59f
+
abe59f
+routines = \
abe59f
+  $(all-dl-routines) \
abe59f
+  dl-addr \
abe59f
+  dl-addr-obj \
abe59f
+  dl-error \
abe59f
+  dl-iteratephdr \
abe59f
+  dl-libc \
abe59f
+  dl-origin \
abe59f
+  dl-profstub \
abe59f
+  dl-reloc-static-pie \
abe59f
+  dl-support \
abe59f
+  dl-sym \
abe59f
+  dl-sysdep \
abe59f
+  enbl-secure \
abe59f
+  libc_early_init \
abe59f
+  # routines
abe59f
 
abe59f
 # The core dynamic linking functions are in libc for the static and
abe59f
 # profiled libraries.
abe59f
-dl-routines	= $(addprefix dl-,load lookup object reloc deps \
abe59f
-				  runtime init fini debug misc \
abe59f
-				  version profile tls origin scope \
abe59f
-				  execstack open close trampoline \
abe59f
-				  exception sort-maps lookup-direct \
abe59f
-				  call-libc-early-init write)
abe59f
+dl-routines = \
abe59f
+  dl-call-libc-early-init \
abe59f
+  dl-close \
abe59f
+  dl-debug \
abe59f
+  dl-deps \
abe59f
+  dl-exception \
abe59f
+  dl-execstack \
abe59f
+  dl-fini \
abe59f
+  dl-init \
abe59f
+  dl-load \
abe59f
+  dl-lookup \
abe59f
+  dl-lookup-direct \
abe59f
+  dl-misc \
abe59f
+  dl-object \
abe59f
+  dl-open \
abe59f
+  dl-origin \
abe59f
+  dl-profile \
abe59f
+  dl-reloc \
abe59f
+  dl-runtime \
abe59f
+  dl-scope \
abe59f
+  dl-sort-maps \
abe59f
+  dl-tls \
abe59f
+  dl-trampoline \
abe59f
+  dl-version \
abe59f
+  dl-write \
abe59f
+  # dl-routines
abe59f
+
abe59f
 ifeq (yes,$(use-ldconfig))
abe59f
 dl-routines += dl-cache
abe59f
 endif
abe59f
@@ -57,15 +97,36 @@ endif
abe59f
 
abe59f
 all-dl-routines = $(dl-routines) $(sysdep-dl-routines)
abe59f
 # But they are absent from the shared libc, because that code is in ld.so.
abe59f
-elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin \
abe59f
-		    dl-sysdep dl-exception dl-reloc-static-pie
abe59f
+elide-routines.os = \
abe59f
+  $(all-dl-routines) \
abe59f
+  dl-exception \
abe59f
+  dl-origin \
abe59f
+  dl-reloc-static-pie \
abe59f
+  dl-support \
abe59f
+  dl-sysdep \
abe59f
+  enbl-secure \
abe59f
+  # elide-routines.os
abe59f
 
abe59f
 # ld.so uses those routines, plus some special stuff for being the program
abe59f
 # interpreter and operating independent of libc.
abe59f
-rtld-routines	= rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal \
abe59f
-  dl-error-minimal dl-conflict dl-hwcaps dl-hwcaps_split dl-hwcaps-subdirs \
abe59f
-  dl-usage dl-diagnostics dl-diagnostics-kernel dl-diagnostics-cpu \
abe59f
-  dl-audit
abe59f
+rtld-routines = \
abe59f
+  $(all-dl-routines) \
abe59f
+  dl-audit \
abe59f
+  dl-conflict \
abe59f
+  dl-diagnostics \
abe59f
+  dl-diagnostics-cpu \
abe59f
+  dl-diagnostics-kernel \
abe59f
+  dl-environ \
abe59f
+  dl-error-minimal \
abe59f
+  dl-hwcaps \
abe59f
+  dl-hwcaps-subdirs \
abe59f
+  dl-hwcaps_split \
abe59f
+  dl-minimal \
abe59f
+  dl-sysdep \
abe59f
+  dl-usage \
abe59f
+  rtld \
abe59f
+  # rtld-routines
abe59f
+
abe59f
 all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines)
abe59f
 
abe59f
 CFLAGS-dl-runtime.c += -fexceptions -fasynchronous-unwind-tables
abe59f
@@ -98,8 +159,18 @@ ld-map		= $(common-objpfx)ld.map
abe59f
 endif
abe59f
 
abe59f
 ifeq (yes,$(build-shared))
abe59f
-extra-objs	= $(all-rtld-routines:%=%.os) soinit.os sofini.os interp.os
abe59f
-generated	+= librtld.os dl-allobjs.os ld.so ldd
abe59f
+extra-objs = \
abe59f
+  $(all-rtld-routines:%=%.os) \
abe59f
+  sofini.os \
abe59f
+  soinit.os \
abe59f
+  interp.os \
abe59f
+  # extra-objs
abe59f
+generated += \
abe59f
+  dl-allobjs.os \
abe59f
+  ldd \
abe59f
+  ld.so \
abe59f
+  librtld.os \
abe59f
+  # generated
abe59f
 install-others	= $(inst_rtlddir)/$(rtld-installed-name) $(inst_bindir)/ld.so
abe59f
 install-bin-script = ldd
abe59f
 endif
abe59f
@@ -117,8 +188,15 @@ others-static	+= ldconfig
abe59f
 others		+= ldconfig
abe59f
 install-rootsbin += ldconfig
abe59f
 
abe59f
-ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon static-stubs \
abe59f
-  stringtable
abe59f
+ldconfig-modules := \
abe59f
+  cache \
abe59f
+  chroot_canon \
abe59f
+  readlib \
abe59f
+  static-stubs \
abe59f
+  stringtable \
abe59f
+  xmalloc \
abe59f
+  xstrdup \
abe59f
+  # ldconfig-modules
abe59f
 extra-objs	+= $(ldconfig-modules:=.o)
abe59f
 others-extras   = $(ldconfig-modules)
abe59f
 endif
abe59f
@@ -153,20 +231,34 @@ $(inst_auditdir)/sotruss-lib.so: $(objpfx)sotruss-lib.so $(+force)
abe59f
 	$(do-install-program)
abe59f
 endif
abe59f
 
abe59f
-tests-static-normal := tst-leaks1-static tst-array1-static tst-array5-static \
abe59f
-	       tst-dl-iter-static \
abe59f
-	       tst-tlsalign-static tst-tlsalign-extern-static \
abe59f
-	       tst-linkall-static tst-env-setuid tst-env-setuid-tunables \
abe59f
-	       tst-dst-static
abe59f
-tests-static-internal := tst-tls1-static tst-tls2-static \
abe59f
-	       tst-ptrguard1-static tst-stackguard1-static \
abe59f
-	       tst-tls1-static-non-pie tst-libc_dlvsym-static
abe59f
+tests-static-normal := \
abe59f
+  tst-array1-static \
abe59f
+  tst-array5-static \
abe59f
+  tst-dl-iter-static \
abe59f
+  tst-dst-static \
abe59f
+  tst-env-setuid \
abe59f
+  tst-env-setuid-tunables \
abe59f
+  tst-leaks1-static \
abe59f
+  tst-linkall-static \
abe59f
+  tst-tlsalign-extern-static \
abe59f
+  tst-tlsalign-static \
abe59f
+  # tests-static-normal
abe59f
+
abe59f
+tests-static-internal := \
abe59f
+  tst-libc_dlvsym-static \
abe59f
+  tst-ptrguard1-static \
abe59f
+  tst-stackguard1-static \
abe59f
+  tst-tls1-static \
abe59f
+  tst-tls1-static-non-pie \
abe59f
+  tst-tls2-static \
abe59f
+  # tests-static-internal
abe59f
 
abe59f
 CRT-tst-tls1-static-non-pie := $(csu-objpfx)crt1.o
abe59f
 tst-tls1-static-non-pie-no-pie = yes
abe59f
 
abe59f
 tests-container = \
abe59f
-			  tst-ldconfig-bad-aux-cache
abe59f
+  tst-ldconfig-bad-aux-cache \
abe59f
+  # tests-container
abe59f
 
abe59f
 ifeq (no,$(build-hardcoded-path-in-tests))
abe59f
 # This is an ld.so.cache test, and RPATH/RUNPATH in the executable
abe59f
@@ -174,14 +266,31 @@ ifeq (no,$(build-hardcoded-path-in-tests))
abe59f
 tests-container += tst-glibc-hwcaps-prepend-cache
abe59f
 endif
abe59f
 
abe59f
-tests := tst-tls9 tst-leaks1 \
abe59f
-	tst-array1 tst-array2 tst-array3 tst-array4 tst-array5 \
abe59f
-	tst-auxv tst-stringtable
abe59f
-tests-internal := tst-tls1 tst-tls2 $(tests-static-internal)
abe59f
+tests := \
abe59f
+  tst-array1 \
abe59f
+  tst-array2 \
abe59f
+  tst-array3 \
abe59f
+  tst-array4 \
abe59f
+  tst-array5 \
abe59f
+  tst-auxv \
abe59f
+  tst-leaks1 \
abe59f
+  tst-stringtable \
abe59f
+  tst-tls9 \
abe59f
+  # tests
abe59f
+
abe59f
+tests-internal := \
abe59f
+  $(tests-static-internal) \
abe59f
+  tst-tls1 \
abe59f
+  tst-tls2 \
abe59f
+  # tests-internal
abe59f
+
abe59f
 tests-static := $(tests-static-normal) $(tests-static-internal)
abe59f
 
abe59f
 ifeq (yes,$(build-shared))
abe59f
-tests-static += tst-tls9-static
abe59f
+tests-static += \
abe59f
+  tst-tls9-static \
abe59f
+  # tests-static
abe59f
+
abe59f
 tst-tls9-static-ENV = \
abe59f
        LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)dlfcn
abe59f
 
abe59f
@@ -302,37 +411,71 @@ tests += \
abe59f
   unload6 \
abe59f
   unload7 \
abe59f
   unload8 \
abe59f
-#	 reldep9
abe59f
+  # tests
abe59f
 tests-cxx = \
abe59f
   tst-dlopen-nodelete-reloc \
abe59f
   tst-nodelete \
abe59f
   tst-unique3 \
abe59f
   tst-unique4 \
abe59f
-# tests-cxx
abe59f
+  # tests-cxx
abe59f
 
abe59f
 tests += $(if $(CXX),$(tests-cxx))
abe59f
-tests-internal += loadtest unload unload2 circleload1 \
abe59f
-	 neededtest neededtest2 neededtest3 neededtest4 \
abe59f
-	 tst-tls3 tst-tls6 tst-tls7 tst-tls8 tst-dlmopen2 \
abe59f
-	 tst-ptrguard1 tst-stackguard1 tst-libc_dlvsym \
abe59f
-	 tst-create_format1 tst-tls-surplus tst-dl-hwcaps_split \
abe59f
-	 tst-audit19a
abe59f
-tests-container += tst-pldd tst-preload-pthread-libc
abe59f
+
abe59f
+tests-internal += \
abe59f
+  circleload1 \
abe59f
+  loadtest \
abe59f
+  neededtest \
abe59f
+  neededtest2 \
abe59f
+  neededtest3 \
abe59f
+  neededtest4 \
abe59f
+  tst-audit19a \
abe59f
+  tst-create_format1 \
abe59f
+  tst-dl-hwcaps_split \
abe59f
+  tst-dlmopen2 \
abe59f
+  tst-libc_dlvsym \
abe59f
+  tst-ptrguard1 \
abe59f
+  tst-stackguard1 \
abe59f
+  tst-tls-surplus \
abe59f
+  tst-tls3 \
abe59f
+  tst-tls6 \
abe59f
+  tst-tls7 \
abe59f
+  tst-tls8 \
abe59f
+  unload \
abe59f
+  unload2 \
abe59f
+  # tests-internal
abe59f
+
abe59f
+tests-container += \
abe59f
+  tst-pldd \
abe59f
+  tst-preload-pthread-libc
abe59f
+  # tests-container
abe59f
+
abe59f
 ifeq ($(build-hardcoded-path-in-tests),yes)
abe59f
 tests += tst-dlopen-aout
abe59f
 tst-dlopen-aout-no-pie = yes
abe59f
 endif
abe59f
-test-srcs = tst-pathopt
abe59f
+test-srcs = \
abe59f
+  tst-pathopt
abe59f
+  # tests-srcs
abe59f
+
abe59f
 selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
abe59f
+
abe59f
 ifneq ($(selinux-enabled),1)
abe59f
-tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog
abe59f
+tests-execstack-yes = \
abe59f
+  tst-execstack \
abe59f
+  tst-execstack-needed \
abe59f
+  tst-execstack-prog \
abe59f
+  # tests-execstack-yes
abe59f
 endif
abe59f
 endif
abe59f
 tests += $(tests-execstack-$(have-z-execstack))
abe59f
 ifeq ($(run-built-tests),yes)
abe59f
-tests-special += $(objpfx)tst-leaks1-mem.out \
abe59f
-		 $(objpfx)tst-leaks1-static-mem.out $(objpfx)noload-mem.out \
abe59f
-		 $(objpfx)tst-ldconfig-X.out $(objpfx)tst-rtld-help.out
abe59f
+tests-special += \
abe59f
+  $(objpfx)noload-mem.out \
abe59f
+  $(objpfx)tst-ldconfig-X.out \
abe59f
+  $(objpfx)tst-leaks1-mem.out \
abe59f
+  $(objpfx)tst-leaks1-static-mem.out \
abe59f
+  $(objpfx)tst-rtld-help.out \
abe59f
+  # tests-special
abe59f
 endif
abe59f
 tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
abe59f
 tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
abe59f
@@ -349,9 +492,16 @@ tst-tls-many-dynamic-modules-dep = \
abe59f
 tst-tls-many-dynamic-modules-dep-bad-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
abe59f
 tst-tls-many-dynamic-modules-dep-bad = \
abe59f
   $(foreach n,$(tst-tls-many-dynamic-modules-dep-bad-suffixes),tst-tls-manydynamic$(n)mod-dep-bad)
abe59f
-extra-test-objs += $(tlsmod17a-modules:=.os) $(tlsmod18a-modules:=.os) \
abe59f
-		   tst-tlsalign-vars.o
abe59f
-test-extras += tst-tlsmod17a tst-tlsmod18a tst-tlsalign-vars
abe59f
+extra-test-objs += \
abe59f
+  $(tlsmod17a-modules:=.os) \
abe59f
+  $(tlsmod18a-modules:=.os) \
abe59f
+  tst-tlsalign-vars.o \
abe59f
+  # extra-test-objs
abe59f
+test-extras += \
abe59f
+  tst-tlsalign-vars \
abe59f
+  tst-tlsmod17a \
abe59f
+  tst-tlsmod18a \
abe59f
+  # test-extras
abe59f
 modules-names = \
abe59f
   circlemod1 \
abe59f
   circlemod1a \
abe59f
@@ -607,17 +757,17 @@ modules-names-cxx = \
abe59f
   tst-unique3lib \
abe59f
   tst-unique3lib2 \
abe59f
   tst-unique4lib \
abe59f
-# modules-names-cxx
abe59f
+  # modules-names-cxx
abe59f
 
abe59f
 modules-names += \
abe59f
   $(if $(CXX),$(modules-names-cxx)) \
abe59f
   $(modules-execstack-$(have-z-execstack)) \
abe59f
+  $(tlsmod17a-modules) \
abe59f
+  $(tlsmod18a-modules) \
abe59f
   $(tst-tls-many-dynamic-modules) \
abe59f
   $(tst-tls-many-dynamic-modules-dep) \
abe59f
   $(tst-tls-many-dynamic-modules-dep-bad) \
abe59f
-  $(tlsmod17a-modules) \
abe59f
-  $(tlsmod18a-modules) \
abe59f
-# modules-names
abe59f
+  # modules-names
abe59f
 
abe59f
 # Most modules build with _ISOMAC defined, but those filtered out
abe59f
 # depend on internal headers.
abe59f
@@ -680,54 +830,103 @@ modules-names-nobuild := filtmod1
abe59f
 tests += $(tests-static)
abe59f
 
abe59f
 ifneq (no,$(multi-arch))
abe59f
-tests-ifuncstatic := ifuncmain1static ifuncmain1picstatic \
abe59f
-		ifuncmain2static ifuncmain2picstatic \
abe59f
-		ifuncmain4static ifuncmain4picstatic \
abe59f
-		ifuncmain5static ifuncmain5picstatic \
abe59f
-		ifuncmain7static ifuncmain7picstatic
abe59f
+tests-ifuncstatic := \
abe59f
+  ifuncmain1static \
abe59f
+  ifuncmain1picstatic \
abe59f
+  ifuncmain2static \
abe59f
+  ifuncmain2picstatic \
abe59f
+  ifuncmain4static \
abe59f
+  ifuncmain4picstatic \
abe59f
+  ifuncmain5static \
abe59f
+  ifuncmain5picstatic \
abe59f
+  ifuncmain7static \
abe59f
+  ifuncmain7picstatic \
abe59f
+  # tests-ifuncstatic
abe59f
 tests-static += $(tests-ifuncstatic)
abe59f
 tests-internal += $(tests-ifuncstatic)
abe59f
 ifeq (yes,$(build-shared))
abe59f
 tests-internal += \
abe59f
-	 ifuncmain1 ifuncmain1pic ifuncmain1vis ifuncmain1vispic \
abe59f
-	 ifuncmain1staticpic \
abe59f
-	 ifuncmain2 ifuncmain2pic ifuncmain3 ifuncmain4 \
abe59f
-	 ifuncmain5 ifuncmain5pic ifuncmain5staticpic \
abe59f
-	 ifuncmain7 ifuncmain7pic
abe59f
-ifunc-test-modules = ifuncdep1 ifuncdep1pic ifuncdep2 ifuncdep2pic \
abe59f
-		     ifuncdep5 ifuncdep5pic
abe59f
+  ifuncmain1 \
abe59f
+  ifuncmain1pic \
abe59f
+  ifuncmain1staticpic \
abe59f
+  ifuncmain1vis \
abe59f
+  ifuncmain1vispic \
abe59f
+  ifuncmain2 \
abe59f
+  ifuncmain2pic \
abe59f
+  ifuncmain3 \
abe59f
+  ifuncmain4 \
abe59f
+  ifuncmain5 \
abe59f
+  ifuncmain5pic \
abe59f
+  ifuncmain5staticpic \
abe59f
+  ifuncmain7 \
abe59f
+  ifuncmain7pic \
abe59f
+  # tests-internal
abe59f
+ifunc-test-modules = \
abe59f
+  ifuncdep1 \
abe59f
+  ifuncdep1pic \
abe59f
+  ifuncdep2 \
abe59f
+  ifuncdep2pic \
abe59f
+  ifuncdep5 \
abe59f
+  ifuncdep5pic \
abe59f
+  # ifunc-test-modules
abe59f
 extra-test-objs += $(ifunc-test-modules:=.o)
abe59f
 test-internal-extras += $(ifunc-test-modules)
abe59f
 ifeq (yes,$(have-fpie))
abe59f
-ifunc-pie-tests = ifuncmain1pie ifuncmain1vispie ifuncmain1staticpie \
abe59f
-		  ifuncmain5pie ifuncmain6pie ifuncmain7pie
abe59f
+ifunc-pie-tests = \
abe59f
+  ifuncmain1pie \
abe59f
+  ifuncmain1staticpie \
abe59f
+  ifuncmain1vispie \
abe59f
+  ifuncmain5pie \
abe59f
+  ifuncmain6pie \
abe59f
+  ifuncmain7pie \
abe59f
+  # ifunc-pie-tests
abe59f
 tests-internal += $(ifunc-pie-tests)
abe59f
 tests-pie += $(ifunc-pie-tests)
abe59f
 endif
abe59f
-modules-names += ifuncmod1 ifuncmod3 ifuncmod5 ifuncmod6
abe59f
+modules-names += \
abe59f
+  ifuncmod1 \
abe59f
+  ifuncmod3 \
abe59f
+  ifuncmod5 \
abe59f
+  ifuncmod6 \
abe59f
+  # modules-names
abe59f
 endif
abe59f
 endif
abe59f
 
abe59f
 ifeq (yes,$(build-shared))
abe59f
 ifeq ($(run-built-tests),yes)
abe59f
-tests-special += $(objpfx)tst-pathopt.out $(objpfx)tst-rtld-load-self.out \
abe59f
-		 $(objpfx)tst-rtld-preload.out $(objpfx)argv0test.out \
abe59f
-		 $(objpfx)tst-rtld-help.out
abe59f
+tests-special += \
abe59f
+  $(objpfx)argv0test.out \
abe59f
+  $(objpfx)tst-pathopt.out \
abe59f
+  $(objpfx)tst-rtld-help.out \
abe59f
+  $(objpfx)tst-rtld-load-self.out \
abe59f
+  $(objpfx)tst-rtld-preload.out \
abe59f
+  # tests-special
abe59f
 endif
abe59f
-tests-special += $(objpfx)check-textrel.out $(objpfx)check-execstack.out \
abe59f
-		 $(objpfx)check-wx-segment.out \
abe59f
-		 $(objpfx)check-localplt.out $(objpfx)check-initfini.out
abe59f
+tests-special += \
abe59f
+  $(objpfx)check-execstack.out \
abe59f
+  $(objpfx)check-initfini.out \
abe59f
+  $(objpfx)check-localplt.out \
abe59f
+  $(objpfx)check-textrel.out \
abe59f
+  $(objpfx)check-wx-segment.out \
abe59f
+  # tests-special
abe59f
 endif
abe59f
 
abe59f
 ifeq ($(run-built-tests),yes)
abe59f
-tests-special += $(objpfx)order-cmp.out $(objpfx)tst-array1-cmp.out \
abe59f
-		 $(objpfx)tst-array1-static-cmp.out \
abe59f
-		 $(objpfx)tst-array2-cmp.out $(objpfx)tst-array3-cmp.out \
abe59f
-		 $(objpfx)tst-array4-cmp.out $(objpfx)tst-array5-cmp.out \
abe59f
-		 $(objpfx)tst-array5-static-cmp.out $(objpfx)order2-cmp.out \
abe59f
-		 $(objpfx)tst-initorder-cmp.out \
abe59f
-		 $(objpfx)tst-initorder2-cmp.out $(objpfx)tst-unused-dep.out \
abe59f
-		 $(objpfx)tst-unused-dep-cmp.out
abe59f
+tests-special += \
abe59f
+  $(objpfx)order-cmp.out \
abe59f
+  $(objpfx)order2-cmp.out \
abe59f
+  $(objpfx)tst-array1-cmp.out \
abe59f
+  $(objpfx)tst-array1-static-cmp.out \
abe59f
+  $(objpfx)tst-array2-cmp.out \
abe59f
+  $(objpfx)tst-array3-cmp.out \
abe59f
+  $(objpfx)tst-array4-cmp.out \
abe59f
+  $(objpfx)tst-array5-cmp.out \
abe59f
+  $(objpfx)tst-array5-static-cmp.out \
abe59f
+  $(objpfx)tst-initorder-cmp.out \
abe59f
+  $(objpfx)tst-initorder2-cmp.out \
abe59f
+  $(objpfx)tst-unused-dep-cmp.out \
abe59f
+  $(objpfx)tst-unused-dep.out \
abe59f
+  # tests-special
abe59f
 endif
abe59f
 
abe59f
 check-abi: $(objpfx)check-abi-ld.out
abe59f
@@ -807,6 +1006,7 @@ rtld-stubbed-symbols = \
abe59f
   free \
abe59f
   malloc \
abe59f
   realloc \
abe59f
+  # rtld-stubbed-symbols
abe59f
 
abe59f
 # The GCC arguments that implement $(rtld-stubbed-symbols).
abe59f
 rtld-stubbed-symbols-args = \