From 428c7383daf21ffe04af4adecdeda85f1d0e222d Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed, 8 Nov 2023 13:49:52 -0300
Subject: [PATCH] sysdeps: Re-flow and sort multiline gnu/Makefile definitions

---
 sysdeps/gnu/Makefile | 54 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index c89eb8ed1c..d23ded40a0 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -16,37 +16,67 @@
 # <https://www.gnu.org/licenses/>.
 
 ifeq ($(subdir),login)
-sysdep_routines += setutxent getutxent endutxent getutxid getutxline \
-		   pututxline utmpxname updwtmpx getutmpx getutmp
+sysdep_routines += \
+  endutxent \
+  getutmp \
+  getutmpx \
+  getutxent \
+  getutxid \
+  getutxline \
+  pututxline \
+  setutxent \
+  updwtmpx \
+  utmpxname \
+  # sysdep_routines
 
-sysdep_headers += utmpx.h bits/utmpx.h
+sysdep_headers += \
+  bits/utmpx.h \
+  utmpx.h \
+  # sysdep_headers
 endif
 
 
 ifeq ($(subdir),inet)
-sysdep_headers += netinet/udp.h netinet/ip_icmp.h
+sysdep_headers += \
+  netinet/ip_icmp.h \
+  netinet/udp.h \
+  # sysdep_headers
 endif
 
 
 ifeq ($(subdir),misc)
-sysdep_headers += sys/mtio.h
+sysdep_headers += \
+  sys/mtio.h \
+  # sysdep_headers
 endif
 
 
 ifeq ($(subdir),csu)
-routines += unwind-resume
-shared-only-routines += unwind-resume
+routines += \
+  unwind-resume \
+  # routines
+shared-only-routines += \
+  unwind-resume \
+  # shared-only-routines
 CFLAGS-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
 endif
 
+
 ifeq ($(subdir),rt)
-librt-sysdep_routines += rt-unwind-resume
-librt-shared-only-routines += rt-unwind-resume
+librt-sysdep_routines += \
+  rt-unwind-resume \
+  # librt-sysdep_routines
+librt-shared-only-routines += \
+  rt-unwind-resume \
+  # librt-shared-only-routines
 CFLAGS-rt-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
 endif
 
+
 ifeq ($(subdir),sysvipc)
-sysdep_headers += bits/ipc-perm.h \
-		  bits/types/struct_msqid_ds.h \
-		  bits/types/struct_shmid_ds.h
+sysdep_headers += \
+  bits/ipc-perm.h \
+  bits/types/struct_msqid_ds.h \
+  bits/types/struct_shmid_ds.h
+  # sysdep_headers
 endif
-- 
2.43.5