[COMMITTED 01/10] conform: Reformat Makefile.

[COMMITTED 01/10] conform: Reformat Makefile.

[Carlos O'Donell]

Reflow and sort Makefile.

No code changes in generated binary artifacts.

No regressions on x86_64 and i686.
---
 conform/Makefile | 344 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 278 insertions(+), 66 deletions(-)

diff --git a/conform/Makefile b/conform/Makefile
index b067cdf83b..73a3cb6da2 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -25,78 +25,290 @@ include ../Makeconfig
 conformtest-headers-data := $(wildcard data/*.h-data) \
 			    $(wildcard data/*/*.h-data)
 
-conformtest-standards := ISO ISO99 ISO11 POSIX XPG4 XPG42 UNIX98 XOPEN2K \
-			 POSIX2008 XOPEN2K8
-
-conformtest-headers-ISO := assert.h ctype.h errno.h float.h limits.h locale.h \
-			   math.h setjmp.h signal.h stdarg.h stddef.h stdio.h \
-			   stdlib.h string.h time.h
-conformtest-headers-ISO99 := $(conformtest-headers-ISO) complex.h fenv.h \
-			     inttypes.h iso646.h stdbool.h stdint.h tgmath.h \
-			     wchar.h wctype.h
+conformtest-standards := \
+  ISO \
+  ISO11 \
+  ISO99 \
+  POSIX \
+  POSIX2008 \
+  UNIX98 \
+  XOPEN2K \
+  XOPEN2K8 \
+  XPG4 \
+  XPG42 \
+  # conformtest-standards
+conformtest-headers-ISO := \
+  assert.h \
+  ctype.h \
+  errno.h \
+  float.h \
+  limits.h \
+  locale.h \
+  math.h \
+  setjmp.h \
+  signal.h \
+  stdarg.h \
+  stddef.h \
+  stdio.h \
+  stdlib.h \
+  string.h \
+  time.h \
+  # conformtest-headers-ISO
+conformtest-headers-ISO99 := \
+  $(conformtest-headers-ISO) \
+  complex.h \
+  fenv.h \
+  inttypes.h \
+  iso646.h \
+  stdbool.h \
+  stdint.h \
+  tgmath.h \
+  wchar.h \
+  wctype.h \
+  # conformtest-headers-ISO99
 # Missing ISO11 expectations for: stdatomic.h
-conformtest-headers-ISO11 := $(conformtest-headers-ISO99) stdalign.h \
-			     stdnoreturn.h threads.h uchar.h
-conformtest-headers-POSIX := $(conformtest-headers-ISO) aio.h dirent.h \
-			     fcntl.h fnmatch.h glob.h grp.h mqueue.h \
-			     pthread.h pwd.h regex.h sched.h semaphore.h \
-			     sys/mman.h sys/stat.h sys/times.h sys/types.h \
-			     sys/utsname.h sys/wait.h tar.h termios.h \
-			     unistd.h utime.h wordexp.h
+conformtest-headers-ISO11 := \
+  $(conformtest-headers-ISO99) \
+  stdalign.h \
+  stdnoreturn.h \
+  threads.h \
+  uchar.h \
+  # conformtest-headers-ISO11
+conformtest-headers-POSIX := \
+  $(conformtest-headers-ISO) \
+  aio.h \
+  dirent.h \
+  fcntl.h \
+  fnmatch.h \
+  glob.h \
+  grp.h \
+  mqueue.h \
+  pthread.h \
+  pwd.h \
+  regex.h \
+  sched.h \
+  semaphore.h \
+  sys/mman.h \
+  sys/stat.h \
+  sys/times.h \
+  sys/types.h \
+  sys/utsname.h \
+  sys/wait.h \
+  tar.h \
+  termios.h \
+  unistd.h \
+  utime.h \
+  wordexp.h \
+  # conformtest-headers-POSIX
 # Missing XPG4 expectations for: regexp.h wchar.h.
-conformtest-headers-XPG4 := $(conformtest-headers-ISO) cpio.h dirent.h \
-			    fcntl.h fnmatch.h ftw.h glob.h grp.h iconv.h \
-			    langinfo.h monetary.h nl_types.h pwd.h regex.h \
-			    search.h sys/ipc.h sys/msg.h sys/sem.h sys/shm.h \
-			    sys/stat.h sys/times.h sys/types.h sys/utsname.h \
-			    sys/wait.h tar.h termios.h ulimit.h unistd.h \
-			    utime.h varargs.h wordexp.h
-# Missing XPG42 expectations for: re_comp.h regexp.h wchar.h.
+conformtest-headers-XPG4 := \
+  $(conformtest-headers-ISO) \
+  cpio.h \
+  dirent.h \
+  fcntl.h \
+  fnmatch.h \
+  ftw.h \
+  glob.h \
+  grp.h \
+  iconv.h \
+  langinfo.h \
+  monetary.h \
+  nl_types.h \
+  pwd.h \
+  regex.h \
+  search.h \
+  sys/ipc.h \
+  sys/msg.h \
+  sys/sem.h \
+  sys/shm.h \
+  sys/stat.h \
+  sys/times.h \
+  sys/types.h \
+  sys/utsname.h \
+  sys/wait.h \
+  tar.h \
+  termios.h \
+  ulimit.h \
+  unistd.h \
+  utime.h \
+  varargs.h \
+  wordexp.h \
+  # conformtest-headers-XPG4
+# Missing XPG42 expectations for:
+#   re_comp.h
+#   regexp.h
+#   wchar.h
 # XPG42 includes XTI and STREAMS, but those are not implemented by glibc.
-conformtest-headers-XPG42 := $(conformtest-headers-XPG4) arpa/inet.h fmtmsg.h \
-			    libgen.h ndbm.h netdb.h netinet/in.h poll.h \
-			    strings.h sys/mman.h sys/resource.h \
-			    sys/socket.h sys/statvfs.h sys/time.h sys/timeb.h \
-			    sys/uio.h sys/un.h syslog.h ucontext.h utmpx.h
-# Missing UNIX98 expectations for: inttypes.h re_comp.h regexp.h.
+conformtest-headers-XPG42 := \
+  $(conformtest-headers-XPG4) \
+  arpa/inet.h \
+  fmtmsg.h \
+  libgen.h \
+  ndbm.h \
+  netdb.h \
+  netinet/in.h \
+  poll.h \
+  strings.h \
+  sys/mman.h \
+  sys/resource.h \
+  sys/socket.h \
+  sys/statvfs.h \
+  sys/time.h \
+  sys/timeb.h \
+  sys/uio.h \
+  sys/un.h \
+  syslog.h \
+  ucontext.h \
+  utmpx.h \
+  # conformtest-headers-XPG42
+# Missing UNIX98 expectations for:
+#   inttypes.h
+#   re_comp.h
+#   regexp.h
 # The online UNIX98 includes XCURSES, but curses.h, term.h and
 # unctrl.h are outside the scope of these tests.  It also includes
 # XTI and STREAMS, but those are not implemented by glibc.
-conformtest-headers-UNIX98 := $(conformtest-headers-POSIX) arpa/inet.h cpio.h \
-			      dlfcn.h fmtmsg.h ftw.h iconv.h iso646.h \
-			      langinfo.h libgen.h monetary.h ndbm.h netdb.h \
-			      netinet/in.h nl_types.h poll.h search.h \
-			      strings.h sys/ipc.h sys/msg.h \
-			      sys/resource.h sys/sem.h sys/shm.h sys/socket.h \
-			      sys/statvfs.h sys/time.h sys/timeb.h sys/uio.h \
-			      sys/un.h syslog.h ucontext.h ulimit.h utmpx.h \
-			      varargs.h wchar.h wctype.h
-# Missing XOPEN2K expectations for: trace.h, stropts.h.
-conformtest-headers-XOPEN2K := $(conformtest-headers-POSIX) arpa/inet.h \
-			       complex.h cpio.h dlfcn.h fenv.h fmtmsg.h ftw.h \
-			       iconv.h inttypes.h iso646.h langinfo.h \
-			       libgen.h monetary.h ndbm.h net/if.h netdb.h \
-			       netinet/in.h netinet/tcp.h nl_types.h poll.h \
-			       search.h spawn.h stdbool.h stdint.h strings.h \
-			       sys/ipc.h sys/msg.h sys/resource.h \
-			       sys/select.h sys/sem.h sys/shm.h sys/socket.h \
-			       sys/statvfs.h sys/time.h sys/timeb.h sys/uio.h \
-			       sys/un.h syslog.h tgmath.h ucontext.h ulimit.h \
-			       utmpx.h wchar.h wctype.h
-# Missing POSIX2008 expectations for: trace.h, stropts.h.
-conformtest-headers-POSIX2008 := $(conformtest-headers-POSIX) arpa/inet.h \
-				 complex.h cpio.h dlfcn.h fenv.h iconv.h \
-				 inttypes.h iso646.h langinfo.h monetary.h \
-				 net/if.h netdb.h netinet/in.h netinet/tcp.h \
-				 nl_types.h poll.h spawn.h stdbool.h stdint.h \
-				 strings.h sys/select.h \
-				 sys/socket.h sys/statvfs.h sys/un.h tgmath.h \
-				 wchar.h wctype.h
-# Missing XOPEN2K8 expectations for: trace.h.
-conformtest-headers-XOPEN2K8 := $(conformtest-headers-POSIX2008) fmtmsg.h \
-				ftw.h libgen.h ndbm.h search.h sys/ipc.h \
-				sys/msg.h sys/resource.h sys/sem.h sys/shm.h \
-				sys/time.h sys/uio.h syslog.h ulimit.h utmpx.h
+conformtest-headers-UNIX98 := \
+  $(conformtest-headers-POSIX) \
+  arpa/inet.h \
+  cpio.h \
+  dlfcn.h \
+  fmtmsg.h \
+  ftw.h \
+  iconv.h \
+  iso646.h \
+  langinfo.h \
+  libgen.h \
+  monetary.h \
+  ndbm.h \
+  netdb.h \
+  netinet/in.h \
+  nl_types.h \
+  poll.h \
+  search.h \
+  strings.h \
+  sys/ipc.h \
+  sys/msg.h \
+  sys/resource.h \
+  sys/sem.h \
+  sys/shm.h \
+  sys/socket.h \
+  sys/statvfs.h \
+  sys/time.h \
+  sys/timeb.h \
+  sys/uio.h \
+  sys/un.h \
+  syslog.h \
+  ucontext.h \
+  ulimit.h \
+  utmpx.h \
+  varargs.h \
+  wchar.h \
+  wctype.h \
+  # conformtest-headers-UNIX98
+# Missing XOPEN2K expectations for:
+#   trace.h
+#   stropts.h
+conformtest-headers-XOPEN2K := \
+  $(conformtest-headers-POSIX) \
+  arpa/inet.h \
+  complex.h \
+  cpio.h \
+  dlfcn.h \
+  fenv.h \
+  fmtmsg.h \
+  ftw.h \
+  iconv.h \
+  inttypes.h \
+  iso646.h \
+  langinfo.h \
+  libgen.h \
+  monetary.h \
+  ndbm.h \
+  net/if.h \
+  netdb.h \
+  netinet/in.h \
+  netinet/tcp.h \
+  nl_types.h \
+  poll.h \
+  search.h \
+  spawn.h \
+  stdbool.h \
+  stdint.h \
+  strings.h \
+  sys/ipc.h \
+  sys/msg.h \
+  sys/resource.h \
+  sys/select.h \
+  sys/sem.h \
+  sys/shm.h \
+  sys/socket.h \
+  sys/statvfs.h \
+  sys/time.h \
+  sys/timeb.h \
+  sys/uio.h \
+  sys/un.h \
+  syslog.h \
+  tgmath.h \
+  ucontext.h \
+  ulimit.h \
+  utmpx.h \
+  wchar.h \
+  wctype.h \
+  # conformtest-headers-XOPEN2K
+# Missing POSIX2008 expectations for:
+#   trace.h
+#   stropts.h
+conformtest-headers-POSIX2008 := \
+  $(conformtest-headers-POSIX) \
+  arpa/inet.h \
+  complex.h \
+  cpio.h \
+  dlfcn.h \
+  fenv.h \
+  iconv.h \
+  inttypes.h \
+  iso646.h \
+  langinfo.h \
+  monetary.h \
+  net/if.h \
+  netdb.h \
+  netinet/in.h \
+  netinet/tcp.h \
+  nl_types.h \
+  poll.h \
+  spawn.h \
+  stdbool.h \
+  stdint.h \
+  strings.h \
+  sys/select.h \
+  sys/socket.h \
+  sys/statvfs.h \
+  sys/un.h \
+  tgmath.h \
+  wchar.h \
+  wctype.h \
+  # conformtest-headers-POSIX2008
+# Missing XOPEN2K8 expectations for:
+#   trace.h
+conformtest-headers-XOPEN2K8 := \
+  $(conformtest-headers-POSIX2008) \
+  fmtmsg.h \
+  ftw.h \
+  libgen.h \
+  ndbm.h \
+  search.h \
+  sys/ipc.h \
+  sys/msg.h \
+  sys/resource.h \
+  sys/sem.h \
+  sys/shm.h \
+  sys/time.h \
+  sys/uio.h \
+  syslog.h \
+  ulimit.h \
+  utmpx.h \
+  # conformtest-headers-XOPEN2K8
 
 conformtest-header-list-base := $(foreach std,$(conformtest-standards),\
 					      header-list-$(std).out)
-- 
2.43.2

[COMMITTED 02/10] csu: Reformat Makefile.

[Carlos O'Donell]

Reflow and sort Makefile.

Code generation changes present due to link order changes.

No regressions on x86_64 and i686.
---
 csu/Makefile | 74 +++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 59 insertions(+), 15 deletions(-)

diff --git a/csu/Makefile b/csu/Makefile
index ac05ab24d5..946fd91031 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -26,20 +26,36 @@ subdir := csu
 
 include ../Makeconfig
 
-routines = init-first libc-start $(libc-init) sysdep version check_fds \
-	   libc-tls dso_handle
+routines = \
+  $(libc-init) \
+  check_fds \
+  dso_handle \
+  init-first \
+  libc-start \
+  libc-tls \
+  sysdep \
+  version \
+  # routines
 aux	 = errno
 elide-routines.os = libc-tls
 csu-dummies = $(filter-out $(start-installed-name),crt1.o Mcrt1.o)
-extra-objs = start.o \
-	     $(start-installed-name) g$(start-installed-name) $(csu-dummies) \
-	     S$(start-installed-name)
+extra-objs = \
+  $(csu-dummies) \
+  $(start-installed-name) \
+  S$(start-installed-name) \
+  g$(start-installed-name) \
+  start.o \
+  # extra-objs
 omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \
 			     b$(start-installed-name) $(csu-dummies) \
 			     S$(start-installed-name) \
 			     r$(start-installed-name) \
 			     gr$(start-installed-name))
-install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies)
+install-lib = \
+  $(csu-dummies) \
+  $(start-installed-name) \
+  g$(start-installed-name) \
+  # install-lib
 
 # No tests are allowed in the csu/ subdirectory because the startup
 # code is compiled with special flags.
@@ -67,7 +83,10 @@ CFLAGS-.os += $(call elide-stack-protector,.os,$(filter-out \
 						 $(routines) $(extra-no-ssp)))
 
 ifeq (yes,$(build-shared))
-extra-objs += S$(start-installed-name) gmon-start.os
+extra-objs += \
+  S$(start-installed-name) \
+  gmon-start.os \
+  # extra-objs
 ifneq ($(start-installed-name),$(static-start-installed-name))
 extra-objs += gmon-start.o
 endif
@@ -78,20 +97,38 @@ extra-objs += gmon-start.o
 endif
 
 ifeq (yes,$(enable-static-pie))
-extra-objs += r$(start-installed-name) gr$(start-installed-name)
-install-lib += r$(start-installed-name) gr$(start-installed-name)
+extra-objs += \
+  gr$(start-installed-name) \
+  r$(start-installed-name) \
+  # extra-objs
+install-lib += \
+  gr$(start-installed-name) \
+  r$(start-installed-name) \
+  # install-lib
 endif
 
 ifneq ($(start-installed-name),$(static-start-installed-name))
-extra-objs += $(static-start-installed-name) g$(static-start-installed-name)
+extra-objs += \
+  $(static-start-installed-name) \
+  g$(static-start-installed-name) \
+  # extra-objs
 omit-deps += $(patsubst %.o,%,$(static-start-installed-name) \
 			     g$(static-start-installed-name))
-install-lib += $(static-start-installed-name) g$(static-start-installed-name)
+install-lib += \
+  $(static-start-installed-name) \
+  g$(static-start-installed-name) \
+  # install-lib
 ifeq (yes,$(enable-static-pie))
-extra-objs += r$(static-start-installed-name) gr$(static-start-installed-name)
+extra-objs += \
+  gr$(static-start-installed-name) \
+  r$(static-start-installed-name) \
+  # extra-objs
 omit-deps += $(patsubst %.o,%,r$(static-start-installed-name) \
 			     gr$(static-start-installed-name))
-install-lib += r$(static-start-installed-name) gr$(static-start-installed-name)
+install-lib += \
+  gr$(static-start-installed-name) \
+  r$(static-start-installed-name) \
+  # install-lib
 endif
 endif
 
@@ -104,7 +141,10 @@ gen-as-const-headers += rtld-sizes.sym
 # These are the special initializer/finalizer files.  They are always the
 # first and last file in the link.  crti.o ... crtn.o define the global
 # "functions" _init and _fini to run the .init and .fini sections.
-crtstuff = crti crtn
+crtstuff = \
+  crti \
+  crtn \
+  # crtstuff
 
 install-lib += $(crtstuff:=.o)
 extra-objs += $(crtstuff:=.o)
@@ -114,7 +154,11 @@ multilib-extra-objs = $(addprefix $(multidir)/, $(install-lib))
 extra-objs += $(multilib-extra-objs)
 endif
 
-extra-objs += abi-note.o init.o static-reloc.o
+extra-objs += \
+  abi-note.o \
+  init.o \
+  static-reloc.o \
+  # extra-objs
 ifeq (yes,$(build-shared))
 extra-objs += static-reloc.os
 endif
-- 
2.43.2

[COMMITTED 03/10] ctype: Reformat Makefile.

[Carlos O'Donell]

Reflow and sort Makefile.

Code generation changes present due to link order changes.

No regressions on x86_64 and i686.
---
 ctype/Makefile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/ctype/Makefile b/ctype/Makefile
index 717d020129..3e09938bd1 100644
--- a/ctype/Makefile
+++ b/ctype/Makefile
@@ -24,9 +24,18 @@ include ../Makeconfig
 
 headers	:= ctype.h
 
-routines	:= ctype ctype-c99 ctype-extn ctype-c99_l ctype_l isctype
-aux		:= ctype-info
-
-tests	:= test_ctype
+routines := \
+  ctype \
+  ctype-c99 \
+  ctype-c99_l \
+  ctype-extn \
+  ctype_l \
+  isctype \
+  # routines
+aux := ctype-info
+
+tests := \
+  test_ctype \
+  # tests
 
 include ../Rules
-- 
2.43.2

[COMMITTED 04/10] dirent: Reformat Makefile.

[Carlos O'Donell]

Reflow and sort Makefile.

Code generation changes present due to link order changes.

No regressions on x86_64 and i686.
---
 dirent/Makefile | 52 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/dirent/Makefile b/dirent/Makefile
index 92587cab9a..556f759f65 100644
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -22,16 +22,48 @@ subdir		:= dirent
 
 include ../Makeconfig
 
-headers		:= dirent.h bits/dirent.h bits/dirent_ext.h
-routines	:= opendir closedir readdir readdir_r rewinddir \
-		   seekdir telldir scandir alphasort versionsort \
-		   getdents getdents64 dirfd readdir64 readdir64_r scandir64 \
-		   alphasort64 versionsort64 fdopendir \
-		   scandirat scandirat64 \
-		   scandir-cancel scandir-tail scandir64-tail
-
-tests	   := list tst-seekdir opendir-tst1 bug-readdir1 tst-fdopendir \
-	      tst-fdopendir2 tst-scandir tst-scandir64
+headers := \
+  bits/dirent.h \
+  bits/dirent_ext.h \
+  dirent.h \
+  # headers
+routines := \
+  alphasort \
+  alphasort64 \
+  closedir \
+  dirfd \
+  fdopendir \
+  getdents \
+  getdents64 \
+  opendir \
+  readdir \
+  readdir64 \
+  readdir64_r \
+  readdir_r \
+  rewinddir \
+  scandir \
+  scandir-cancel \
+  scandir-tail \
+  scandir64 \
+  scandir64-tail \
+  scandirat \
+  scandirat64 \
+  seekdir \
+  telldir \
+  versionsort \
+  versionsort64 \
+  # routines
+
+tests := \
+  bug-readdir1 \
+  list \
+  opendir-tst1 \
+  tst-fdopendir \
+  tst-fdopendir2 \
+  tst-scandir \
+  tst-scandir64 \
+  tst-seekdir \
+  # tests
 
 CFLAGS-scandir.c += $(uses-callbacks)
 CFLAGS-scandir64.c += $(uses-callbacks)
-- 
2.43.2

[COMMITTED 05/10] dlfcn: Reformat Makefile.

[Carlos O'Donell]

Reflow and sort Makefile.

No code generation changes in non-test binary artifacts.

No regressions on x86_64 and i686.
---
 dlfcn/Makefile | 74 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 62 insertions(+), 12 deletions(-)

diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index 6944fb3610..d473773dd4 100644
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -19,7 +19,11 @@ subdir		:= dlfcn
 
 include ../Makeconfig
 
-headers		:= bits/dlfcn.h bits/dl_find_object.h dlfcn.h
+headers := \
+  bits/dl_find_object.h \
+  bits/dlfcn.h \
+  dlfcn.h \
+  # headers
 extra-libs	:= libdl
 libdl-routines	:= libdl-compat
 routines = \
@@ -33,6 +37,7 @@ routines = \
   dlsym \
   dlvsym \
   libc_dlerror_result \
+  # routines
 
 extra-libs-others := libdl
 
@@ -49,24 +54,69 @@ shared-only-routines := dlopenold
 endif
 
 ifeq (yes,$(build-shared))
-tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \
-	bug-dlopen1 bug-dlsym1 tst-dlinfo bug-atexit1 bug-atexit2 \
-	bug-atexit3 tstatexit bug-dl-leaf tst-rec-dlopen
+tests = \
+  bug-atexit1 \
+  bug-atexit2 \
+  bug-atexit3 \
+  bug-dl-leaf \
+  bug-dlopen1 \
+  bug-dlsym1 \
+  default \
+  errmsg1 \
+  failtest \
+  glrefmain \
+  tst-dladdr \
+  tst-dlinfo \
+  tst-rec-dlopen \
+  tstatexit \
+  tstcxaatexit \
+  # tests
 endif
-modules-names = glreflib1 glreflib2 glreflib3 failtestmod defaultmod1 \
-		defaultmod2 errmsg1mod modatexit modcxaatexit \
-		bug-dlsym1-lib1 bug-dlsym1-lib2 bug-atexit1-lib \
-		bug-atexit2-lib bug-dl-leaf-lib \
-		bug-dl-leaf-lib-cb moddummy1 moddummy2
+modules-names = \
+  bug-atexit1-lib \
+  bug-atexit2-lib \
+  bug-dl-leaf-lib \
+  bug-dl-leaf-lib-cb \
+  bug-dlsym1-lib1 \
+  bug-dlsym1-lib2 \
+  defaultmod1 \
+  defaultmod2 \
+  errmsg1mod \
+  failtestmod \
+  glreflib1 \
+  glreflib2 \
+  glreflib3 \
+  modatexit \
+  modcxaatexit \
+  moddummy1 \
+  moddummy2 \
+  # modules-names
 
 failtestmod.so-no-z-defs = yes
 glreflib2.so-no-z-defs = yes
 errmsg1mod.so-no-z-defs = yes
 
 ifeq (yes,$(build-shared))
-tests += tststatic tststatic2 tststatic3 tststatic4 tststatic5
-tests-static += tststatic tststatic2 tststatic3 tststatic4 tststatic5
-modules-names += modstatic modstatic2 modstatic3 modstatic5
+tests += \
+  tststatic \
+  tststatic2 \
+  tststatic3 \
+  tststatic4 \
+  tststatic5 \
+  # tests
+tests-static += \
+  tststatic \
+  tststatic2 \
+  tststatic3 \
+  tststatic4 \
+  tststatic5 \
+  # tests-static
+modules-names += \
+  modstatic \
+  modstatic2 \
+  modstatic3 \
+  modstatic5 \
+  # modules-names
 tststatic-ENV = LD_LIBRARY_PATH=$(ld-library-path):$(common-objpfx)elf
 tststatic2-ENV = $(tststatic-ENV)
 tststatic3-ENV = $(tststatic-ENV)
-- 
2.43.2

[COMMITTED 06/10] gmon: Reformat Makefile.

[Carlos O'Donell]

Reflow and sort Makefile.

Code generation changes present due to link order changes.

No regressions on x86_64 and i686.
---
 gmon/Makefile | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/gmon/Makefile b/gmon/Makefile
index 4e1a4a309c..db19c205d1 100644
--- a/gmon/Makefile
+++ b/gmon/Makefile
@@ -23,13 +23,28 @@ subdir	:= gmon
 
 include ../Makeconfig
 
-headers	:= sys/gmon.h sys/gmon_out.h sys/profil.h
-routines := gmon mcount profil sprofil prof-freq
-
-tests	= tst-sprofil tst-gmon tst-mcount-overflow tst-mcleanup
+headers := \
+  sys/gmon.h \
+  sys/gmon_out.h \
+  sys/profil.h \
+  # headers
+routines := \
+  gmon \
+  mcount \
+  prof-freq \
+  profil \
+  sprofil \
+  # routines
+
+tests = \
+  tst-gmon \
+  tst-mcleanup \
+  tst-mcount-overflow \
+  tst-sprofil \
+  # tests
 ifeq ($(build-profile),yes)
-tests	+= tst-profile-static
-tests-static	+= tst-profile-static
+tests += tst-profile-static
+tests-static += tst-profile-static
 
 LDFLAGS-tst-profile-static = -profile
 endif
-- 
2.43.2

[COMMITTED 07/10] hesiod: Reformat Makefile.

[Carlos O'Donell]

Reflow and sort Makefile.

No code generation changes in non-test binary artifacts.

No regressions on x86_64 and i686.
---
 hesiod/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hesiod/Makefile b/hesiod/Makefile
index 9dee070ff7..397f92733f 100644
--- a/hesiod/Makefile
+++ b/hesiod/Makefile
@@ -28,8 +28,13 @@ extra-libs-others = $(extra-libs)
 subdir-dirs = nss_hesiod
 vpath %.c nss_hesiod
 
-libnss_hesiod-routines	:= hesiod hesiod-grp hesiod-proto \
-			   hesiod-pwd hesiod-service
+libnss_hesiod-routines := \
+  hesiod \
+  hesiod-grp \
+  hesiod-proto \
+  hesiod-pwd \
+  hesiod-service \
+  # libnss_hesiod-routines
 # Build only shared library
 libnss_hesiod-inhibit-o	= $(filter-out .os,$(object-suffixes))
 
-- 
2.43.2

[COMMITTED 08/10] htl: Reformat Makefile.

[Carlos O'Donell]

Reflow and sort Makefile.

Code generation changes present due to link order changes.

No regressions on x86_64 and i686.
---
 htl/Makefile | 324 +++++++++++++++++++++++++++++----------------------
 1 file changed, 183 insertions(+), 141 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index fd4d463ab0..4028e5a240 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -24,150 +24,192 @@ SYSDEPS := lockfile
 
 LCLHDRS :=
 
-libpthread-routines := pt-attr pt-attr-destroy                   	    \
-	pt-attr-getguardsize                     			    \
-	pt-attr-getscope	                                            \
-	pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize	    \
-	pt-attr-init pt-attr-setguardsize                       	    \
-	pt-attr-setschedparam			                            \
-	pt-attr-setscope pt-attr-setstack	                            \
-	pt-attr-setstackaddr pt-attr-setstacksize			    \
-									    \
-	pt-barrier-destroy pt-barrier-init pt-barrier-wait		    \
-	pt-barrier pt-barrierattr-destroy pt-barrierattr-init		    \
-	pt-barrierattr-getpshared pt-barrierattr-setpshared		    \
-									    \
-	pt-destroy-specific pt-init-specific				    \
-	pt-key-create pt-key-delete					    \
-	pt-getspecific pt-setspecific					    \
-									    \
-	pt-once								    \
-									    \
-	pt-alloc							    \
-	pt-create							    \
-	pt-getattr							    \
-	pt-dealloc							    \
-	pt-detach							    \
-	pt-exit								    \
-	pt-initialize							    \
-	pt-join								    \
-	pt-sigmask							    \
-	pt-spin-inlines							    \
-	pt-cleanup							    \
-	pt-setcancelstate						    \
-	pt-setcanceltype						    \
-	pt-testcancel							    \
-	pt-cancel							    \
-									    \
-	pt-mutexattr-destroy pt-mutexattr-init				    \
-	pt-mutexattr-getprioceiling pt-mutexattr-getprotocol		    \
-	pt-mutexattr-getpshared pt-mutexattr-gettype			    \
-	pt-mutexattr-setprioceiling pt-mutexattr-setprotocol		    \
-	pt-mutexattr-setpshared pt-mutexattr-settype			    \
-	pt-mutexattr-getrobust pt-mutexattr-setrobust			    \
-									    \
-	pt-mutex-init pt-mutex-destroy pt-mutex-checklocked		    \
-	pt-mutex-lock pt-mutex-trylock pt-mutex-timedlock		    \
-	pt-mutex-unlock							    \
-	pt-mutex-transfer-np						    \
-	pt-mutex-getprioceiling pt-mutex-setprioceiling			    \
-	pt-mutex-consistent 						    \
-									    \
-	pt-rwlock-attr							    \
-	pt-rwlockattr-init pt-rwlockattr-destroy			    \
-	pt-rwlockattr-getpshared pt-rwlockattr-setpshared		    \
-									    \
-	pt-rwlock-init pt-rwlock-destroy				    \
-	pt-rwlock-rdlock pt-rwlock-tryrdlock				    \
-	pt-rwlock-trywrlock pt-rwlock-wrlock				    \
-	pt-rwlock-timedrdlock pt-rwlock-timedwrlock			    \
-	pt-rwlock-unlock						    \
-									    \
-	pt-cond								    \
-	pt-condattr-init pt-condattr-destroy				    \
-	pt-condattr-getclock pt-condattr-getpshared			    \
-	pt-condattr-setclock pt-condattr-setpshared			    \
-									    \
-	pt-cond-destroy pt-cond-init					    \
-	pt-cond-brdcast							    \
-	pt-cond-signal							    \
-	pt-cond-wait							    \
-	pt-cond-timedwait						    \
-	pt-hurd-cond-wait						    \
-	pt-hurd-cond-timedwait						    \
-									    \
-	pt-stack-alloc							    \
-	pt-thread-alloc							    \
-	pt-thread-start							    \
-	pt-thread-terminate						    \
-	pt-startup							    \
-									    \
-	pt-getconcurrency pt-setconcurrency				    \
-									    \
-	pt-block							    \
-	pt-timedblock							    \
-	pt-block-intr							    \
-	pt-timedblock-intr						    \
-	pt-wakeup							    \
-	pt-docancel							    \
-	pt-sysdep							    \
-	pt-setup							    \
-	pt-machdep							    \
-	pt-spin								    \
-									    \
-	pt-sigstate-init						    \
-	pt-sigstate-destroy						    \
-	pt-sigstate							    \
-									    \
-	pt-kill								    \
-	pt-getcpuclockid						    \
-									    \
-	pt-setschedprio		                                            \
-	pt-yield							    \
-									    \
-	sem_close sem-destroy sem-getvalue sem-init sem_open		    \
-	sem-post sem-timedwait sem-trywait sem_unlink			    \
-	sem-wait sem-waitfast						    \
-	sem_routines							    \
-									    \
-	cancellation							    \
-	cthreads-compat							    \
-	herrno								    \
-	$(SYSDEPS)
-
-headers :=				\
-              pthread.h				\
-	      semaphore.h			\
-						\
-              bits/pthread.h			\
-              bits/pthread-np.h			\
-              bits/pthreadtypes.h		\
-              bits/pthreadtypes-arch.h		\
-              bits/thread-shared-types.h	\
-              bits/types/struct___pthread_mutex.h	\
-              bits/types/struct___pthread_cond.h	\
-              bits/types/struct___pthread_condattr.h	\
-              bits/types/__pthread_spinlock_t.h	\
-              bits/spin-lock-inline.h		\
-              bits/cancelation.h		\
-              bits/types/struct___pthread_attr.h	\
-              bits/types/struct___pthread_barrierattr.h	\
-              bits/types/struct___pthread_barrier.h	\
-              bits/types/__pthread_key.h		\
-              bits/types/struct___pthread_once.h	\
-              bits/types/struct___pthread_mutexattr.h	\
-              bits/types/struct___pthread_rwlock.h	\
-              bits/types/struct___pthread_rwlockattr.h	\
-              bits/types/__pthread_t.h		\
-              bits/types/__thrd_t.h		\
-	      bits/semaphore.h
+libpthread-routines := \
+  pt-attr \
+  pt-attr-destroy \
+  pt-attr-getguardsize \
+  pt-attr-getscope \
+  pt-attr-getstack \
+  pt-attr-getstackaddr \
+  pt-attr-getstacksize \
+  pt-attr-init \
+  pt-attr-setguardsize \
+  pt-attr-setschedparam \
+  pt-attr-setscope \
+  pt-attr-setstack \
+  pt-attr-setstackaddr \
+  pt-attr-setstacksize \
+  pt-barrier-destroy \
+  pt-barrier-init \
+  pt-barrier-wait \
+  pt-barrier \
+  pt-barrierattr-destroy \
+  pt-barrierattr-init \
+  pt-barrierattr-getpshared \
+  pt-barrierattr-setpshared \
+  pt-destroy-specific \
+  pt-init-specific \
+  pt-key-create \
+  pt-key-delete \
+  pt-getspecific \
+  pt-setspecific \
+  pt-once \
+  pt-alloc \
+  pt-create \
+  pt-getattr \
+  pt-dealloc \
+  pt-detach \
+  pt-exit \
+  pt-initialize \
+  pt-join \
+  pt-sigmask \
+  pt-spin-inlines \
+  pt-cleanup \
+  pt-setcancelstate \
+  pt-setcanceltype \
+  pt-testcancel \
+  pt-cancel \
+  pt-mutexattr-destroy \
+  pt-mutexattr-init \
+  pt-mutexattr-getprioceiling \
+  pt-mutexattr-getprotocol \
+  pt-mutexattr-getpshared \
+  pt-mutexattr-gettype \
+  pt-mutexattr-setprioceiling \
+  pt-mutexattr-setprotocol \
+  pt-mutexattr-setpshared \
+  pt-mutexattr-settype \
+  pt-mutexattr-getrobust \
+  pt-mutexattr-setrobust \
+  pt-mutex-init \
+  pt-mutex-destroy \
+  pt-mutex-checklocked \
+  pt-mutex-lock \
+  pt-mutex-trylock \
+  pt-mutex-timedlock \
+  pt-mutex-unlock \
+  pt-mutex-transfer-np \
+  pt-mutex-getprioceiling \
+  pt-mutex-setprioceiling \
+  pt-mutex-consistent \
+  pt-rwlock-attr \
+  pt-rwlockattr-init \
+  pt-rwlockattr-destroy \
+  pt-rwlockattr-getpshared \
+  pt-rwlockattr-setpshared \
+  pt-rwlock-init \
+  pt-rwlock-destroy \
+  pt-rwlock-rdlock \
+  pt-rwlock-tryrdlock \
+  pt-rwlock-trywrlock \
+  pt-rwlock-wrlock \
+  pt-rwlock-timedrdlock \
+  pt-rwlock-timedwrlock \
+  pt-rwlock-unlock \
+  pt-cond \
+  pt-condattr-init \
+  pt-condattr-destroy \
+  pt-condattr-getclock \
+  pt-condattr-getpshared \
+  pt-condattr-setclock \
+  pt-condattr-setpshared \
+  pt-cond-destroy \
+  pt-cond-init \
+  pt-cond-brdcast \
+  pt-cond-signal \
+  pt-cond-wait \
+  pt-cond-timedwait \
+  pt-hurd-cond-wait \
+  pt-hurd-cond-timedwait \
+  pt-stack-alloc \
+  pt-thread-alloc \
+  pt-thread-start \
+  pt-thread-terminate \
+  pt-startup \
+  pt-getconcurrency \
+  pt-setconcurrency \
+  pt-block \
+  pt-timedblock \
+  pt-block-intr \
+  pt-timedblock-intr \
+  pt-wakeup \
+  pt-docancel \
+  pt-sysdep \
+  pt-setup \
+  pt-machdep \
+  pt-spin \
+  pt-sigstate-init \
+  pt-sigstate-destroy \
+  pt-sigstate \
+  pt-kill \
+  pt-getcpuclockid \
+  pt-setschedprio \
+  pt-yield \
+  sem_close \
+  sem-destroy \
+  sem-getvalue \
+  sem-init \
+  sem_open \
+  sem-post \
+  sem-timedwait \
+  sem-trywait \
+  sem_unlink \
+  sem-wait \
+  sem-waitfast \
+  sem_routines \
+  cancellation \
+  cthreads-compat \
+  herrno \
+  $(SYSDEPS) \
+  # libpthread-routine
+
+headers := \
+  bits/cancelation.h \
+  bits/pthread-np.h \
+  bits/pthread.h \
+  bits/pthreadtypes-arch.h \
+  bits/pthreadtypes.h \
+  bits/semaphore.h \
+  bits/spin-lock-inline.h \
+  bits/thread-shared-types.h \
+  bits/types/__pthread_key.h \
+  bits/types/__pthread_spinlock_t.h \
+  bits/types/__pthread_t.h \
+  bits/types/__thrd_t.h \
+  bits/types/struct___pthread_attr.h \
+  bits/types/struct___pthread_barrier.h \
+  bits/types/struct___pthread_barrierattr.h \
+  bits/types/struct___pthread_cond.h \
+  bits/types/struct___pthread_condattr.h \
+  bits/types/struct___pthread_mutex.h \
+  bits/types/struct___pthread_mutexattr.h \
+  bits/types/struct___pthread_once.h \
+  bits/types/struct___pthread_rwlock.h \
+  bits/types/struct___pthread_rwlockattr.h \
+  pthread.h \
+  semaphore.h \
+  # headers
 
 distribute :=
 
-routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal \
-	pt-getschedparam pt-setschedparam pt-attr-getschedparam pt-attr-getinheritsched                     \
-	pt-attr-setinheritsched pt-attr-getschedpolicy pt-attr-setschedpolicy pt-attr-getdetachstate        \
-	pt-attr-setdetachstate
+routines := \
+  alloca_cutoff \
+  forward \
+  htlfreeres \
+  libc_pthread_init \
+  pt-attr-getdetachstate \
+  pt-attr-getinheritsched \
+  pt-attr-getschedparam \
+  pt-attr-getschedpolicy \
+  pt-attr-setdetachstate \
+  pt-attr-setinheritsched \
+  pt-attr-setschedpolicy \
+  pt-getschedparam \
+  pt-nthreads \
+  pt-pthread_self \
+  pt-self pt-equal \
+  pt-setschedparam \
+  # routines
 shared-only-routines = forward
 
 extra-libs := libpthread
-- 
2.43.2

[COMMITTED 09/10] htl/tests: Reformat Makefile.

[Carlos O'Donell]

Reflow and sort Makefile.

No code generation changes in non-test binary artifacts.

No regressions on x86_64 and i686.

Tested with build-many-glibcs.py for x86_64-gnu.
---
 htl/tests/Makefile | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/htl/tests/Makefile b/htl/tests/Makefile
index 7177ad181e..468adb58d5 100644
--- a/htl/tests/Makefile
+++ b/htl/tests/Makefile
@@ -7,9 +7,24 @@ CFLAGS=-Wall -g
 
 LDLIBS = -lpthread
 
-CHECK_SRC := test-1.c test-2.c test-3.c test-6.c test-7.c test-8.c	\
-	test-9.c test-10.c test-11.c test-12.c test-13.c test-14.c	\
-	test-15.c test-16.c test-17.c test-__pthread_destroy_specific-skip.c
+CHECK_SRC := \
+  test-1.c \
+  test-10.c \
+  test-11.c \
+  test-12.c \
+  test-13.c \
+  test-14.c \
+  test-15.c \
+  test-16.c \
+  test-17.c \
+  test-2.c \
+  test-3.c \
+  test-6.c \
+  test-7.c \
+  test-8.c \
+  test-9.c \
+  test-__pthread_destroy_specific-skip.c \
+  # CHECK_SRC
 
 CHECK_OBJS := $(addsuffix .o,$(basename $(notdir $(CHECK_SRC))))
 CHECK_PROGS := $(basename $(notdir $(CHECK_SRC))) \
@@ -37,4 +52,4 @@ check: $(CHECK_OBJS) $(CHECK_PROGS)
 
 clean:
 	rm -f $(CHECK_OBJS) $(CHECK_PROGS) \
-	  $(addsuffix .out,$(basename $(notdir $(CHECK_PROGS))))
\ No newline at end of file
+	  $(addsuffix .out,$(basename $(notdir $(CHECK_PROGS))))
-- 
2.43.2

[COMMITTED 10/10] hurd: Reformat Makefile.

[Carlos O'Donell]

Reflow and sort Makefile.

Code generation changes present due to link order changes.

No regressions on x86_64 and i686.

Tested with build-many-glibcs.py for x86_64-gnu.
---
 hurd/Makefile | 171 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 129 insertions(+), 42 deletions(-)

diff --git a/hurd/Makefile b/hurd/Makefile
index 7138e3a6ae..bf1636adec 100644
--- a/hurd/Makefile
+++ b/hurd/Makefile
@@ -19,51 +19,138 @@ subdir := hurd
 
 include ../Makeconfig
 
-headers = hurd.h $(interface-headers) \
-	  $(addprefix hurd/,fd.h id.h port.h signal.h sigpreempt.h ioctl.h\
-			    userlink.h resource.h lookup.h)
-
-inline-headers = hurd.h $(addprefix hurd/,fd.h signal.h \
-					  userlink.h port.h)
+headers = \
+  $(interface-headers) \
+  hurd.h \
+  hurd/fd.h \
+  hurd/id.h \
+  hurd/ioctl.h \
+  hurd/lookup.h \
+  hurd/port.h \
+  hurd/resource.h \
+  hurd/signal.h \
+  hurd/sigpreempt.h \
+  hurd/userlink.h \
+  # headers
+
+inline-headers = \
+  hurd.h \
+  hurd/fd.h \
+  hurd/port.h \
+  hurd/signal.h \
+  hurd/userlink.h \
+  # inline-headers
 
 # The RPC interfaces go in a separate library.
 interface-library := libhurduser
-user-interfaces		:= $(addprefix hurd/,\
-				       auth startup \
-				       process process_request \
-				       msg msg_reply msg_request \
-				       exec exec_startup crash interrupt \
-				       fs fsys io io_reply io_request \
-				       term tioctl socket ifsock \
-				       login password pfinet pci \
-				       )
-server-interfaces	:= hurd/msg faultexc
-
-routines = hurdstartup hurdinit \
-	   hurdid hurdpid hurdrlimit hurdprio hurdexec hurdselect \
-	   hurdlookup lookup-retry lookup-at \
-	   get-host set-host \
-	   path-lookup \
-	   setauth \
-	   pid2task task2pid \
-	   geteuids seteuids getumask fchroot \
-	   hurdsock hurdauth \
-	   hurdchdir hurdfchdir \
-	   privports \
-	   msgportdemux \
-	   fopenport \
-	   vpprintf \
-	   ports-get ports-set hurdports hurdmsg \
-	   errno-loc \
-	   hurdlock \
-	   $(sig) $(dtable) $(inlines) \
-	   fd-cleanup port-cleanup report-wait xattr
-sig	= hurdsig hurdfault siginfo hurd-raise preempt-sig \
-	  trampoline longjmp-ts catch-exc exc2signal hurdkill sigunwind \
-	  thread-self thread-cancel intr-msg catch-signal
-dtable	= dtable port2fd new-fd alloc-fd intern-fd \
-	  getdport openport \
-	  fd-close fd-read fd-write hurdioctl ctty-input ctty-output
+user-interfaces := \
+  hurd/auth \
+  hurd/crash \
+  hurd/exec \
+  hurd/exec_startup \
+  hurd/fs \
+  hurd/fsys \
+  hurd/ifsock \
+  hurd/interrupt \
+  hurd/io \
+  hurd/io_reply \
+  hurd/io_request \
+  hurd/login \
+  hurd/msg \
+  hurd/msg_reply \
+  hurd/msg_request \
+  hurd/password \
+  hurd/pci \
+  hurd/pfinet \
+  hurd/process \
+  hurd/process_request \
+  hurd/socket \
+  hurd/startup \
+  hurd/term \
+  hurd/tioctl \
+  # user-interfaces
+
+server-interfaces := \
+  faultexc \
+  hurd/msg \
+  # server-interfaces
+
+routines = \
+  $(dtable) \
+  $(inlines) \
+  $(sig) \
+  errno-loc \
+  fchroot \
+  fd-cleanup \
+  fopenport \
+  get-host \
+  geteuids \
+  getumask \
+  hurdauth \
+  hurdchdir \
+  hurdexec \
+  hurdfchdir \
+  hurdid \
+  hurdinit \
+  hurdlock \
+  hurdlookup \
+  hurdmsg \
+  hurdpid \
+  hurdports \
+  hurdprio \
+  hurdrlimit \
+  hurdselect \
+  hurdsock \
+  hurdstartup \
+  lookup-at \
+  lookup-retry \
+  msgportdemux \
+  path-lookup \
+  pid2task \
+  port-cleanup \
+  ports-get \
+  ports-set \
+  privports \
+  report-wait \
+  set-host \
+  setauth \
+  seteuids \
+  task2pid \
+  vpprintf \
+  xattr \
+  # routines
+sig = \
+  catch-exc \
+  catch-signal \
+  exc2signal \
+  hurd-raise \
+  hurdfault \
+  hurdkill \
+  hurdsig \
+  intr-msg \
+  longjmp-ts \
+  preempt-sig \
+  siginfo \
+  sigunwind \
+  thread-cancel \
+  thread-self \
+  trampoline \
+  # sig
+dtable = \
+  alloc-fd \
+  ctty-input \
+  ctty-output \
+  dtable \
+  fd-close \
+  fd-read \
+  fd-write \
+  getdport \
+  hurdioctl \
+  intern-fd \
+  new-fd \
+  openport \
+  port2fd \
+  # dtable
 inlines = $(inline-headers:%.h=%-inlines)
 
 # XXX this is a temporary hack; see hurdmalloc.h
-- 
2.43.2