* [COMMITTED 1/8] elf: Reformat Makefile.
2023-05-16 12:48 [COMMITTED 0/8] Reformat most used Makefiles Carlos O'Donell
@ 2023-05-16 12:48 ` Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 2/8] debug: " Carlos O'Donell
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Carlos O'Donell @ 2023-05-16 12:48 UTC (permalink / raw)
To: libc-alpha; +Cc: Carlos O'Donell
Fix list terminator whitspace.
Sort using scripts/sort-makefile-lines.py.
No code generation changes observed in binary artifacts.
No regressions on x86_64 and i686.
---
elf/Makefile | 70 ++++++++++++++++++++++++++--------------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/elf/Makefile b/elf/Makefile
index b9056264d8..c6d499aa66 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -190,8 +190,8 @@ endif
ifeq (yes,$(build-shared))
extra-objs = \
$(all-rtld-routines:%=%.os) \
- sofini.os \
interp.os \
+ sofini.os \
# extra-objs
generated += \
dl-allobjs.os \
@@ -395,17 +395,17 @@ tests += \
tst-deep1 \
tst-dl-is_dso \
tst-dlmodcount \
- tst-dlmopen1 \
- tst-dlmopen3 \
- tst-dlmopen4 \
tst-dlmopen-dlerror \
tst-dlmopen-gethostbyname \
tst-dlmopen-twice \
+ tst-dlmopen1 \
+ tst-dlmopen3 \
+ tst-dlmopen4 \
+ tst-dlopen-self \
+ tst-dlopen-tlsmodid \
tst-dlopenfail \
tst-dlopenfail-2 \
tst-dlopenrpath \
- tst-dlopen-self \
- tst-dlopen-tlsmodid \
tst-dlsym-error \
tst-filterobj \
tst-filterobj-dlopen \
@@ -420,9 +420,9 @@ tests += \
tst-latepthread \
tst-main1 \
tst-next-ver \
- tst-nodelete2 \
tst-nodelete-dlclose \
tst-nodelete-opened \
+ tst-nodelete2 \
tst-noload \
tst-null-argv \
tst-p_align1 \
@@ -436,6 +436,10 @@ tests += \
tst-sonamemove-dlopen \
tst-sonamemove-link \
tst-thrlock \
+ tst-tls-dlinfo \
+ tst-tls-ie \
+ tst-tls-ie-dlmopen \
+ tst-tls-manydynamic \
tst-tls10 \
tst-tls11 \
tst-tls12 \
@@ -452,10 +456,6 @@ tests += \
tst-tls5 \
tst-tlsalign \
tst-tlsalign-extern \
- tst-tls-dlinfo \
- tst-tls-ie \
- tst-tls-ie-dlmopen \
- tst-tls-manydynamic \
tst-unique1 \
tst-unique2 \
tst-unwind-ctor \
@@ -547,27 +547,27 @@ tests += \
tst-relr2 \
tst-relr3 \
tst-relr4 \
-# tests
+ # tests
modules-names-dt-relr = \
tst-relr-mod2 \
tst-relr-mod3a \
tst-relr-mod3b \
tst-relr-mod4a \
tst-relr-mod4b \
-# modules-names-dt-relr
+ # modules-names-dt-relr
modules-names += $(modules-names-dt-relr)
# These shared libraries have special build rules.
modules-names-nobuild += $(modules-names-dt-relr)
ifeq ($(have-fpie),yes)
tests += \
tst-relr-pie \
-# tests
+ # tests
tests-pie += \
tst-relr-pie \
-# tests-pie
+ # tests-pie
tests-special += \
$(objpfx)check-tst-relr-pie.out \
-# tests-special
+ # tests-special
endif
CFLAGS-tst-relr-pie.c += $(pie-ccflag)
LDFLAGS-tst-relr += -Wl,-z,pack-relative-relocs
@@ -781,8 +781,6 @@ modules-names += \
tst-auditmanymod9 \
tst-auditmod-tlsdesc \
tst-auditmod1 \
- tst-auditmod9a \
- tst-auditmod9b \
tst-auditmod11 \
tst-auditmod12 \
tst-auditmod18 \
@@ -799,6 +797,8 @@ modules-names += \
tst-auditmod24d \
tst-auditmod25 \
tst-auditmod28 \
+ tst-auditmod9a \
+ tst-auditmod9b \
tst-auxvalmod \
tst-big-note-lib \
tst-deep1mod1 \
@@ -813,11 +813,11 @@ modules-names += \
tst-dl_find_object-mod7 \
tst-dl_find_object-mod8 \
tst-dl_find_object-mod9 \
- tst-dlmopen1mod \
tst-dlmopen-dlerror-mod \
tst-dlmopen-gethostbyname-mod \
tst-dlmopen-twice-mod1 \
tst-dlmopen-twice-mod2 \
+ tst-dlmopen1mod \
tst-dlopenfaillinkmod \
tst-dlopenfailmod1 \
tst-dlopenfailmod2 \
@@ -845,10 +845,10 @@ modules-names += \
tst-ldconfig-soname-lib-with-soname \
tst-ldconfig-soname-lib-without-soname \
tst-main1mod \
- tst-nodelete2mod \
tst-nodelete-dlclose-dso \
tst-nodelete-dlclose-plugin \
tst-nodelete-opened-lib \
+ tst-nodelete2mod \
tst-null-argv-lib \
tst-p_alignmod-base \
tst-p_alignmod3 \
@@ -863,12 +863,6 @@ modules-names += \
tst-sonamemove-runmod1 \
tst-sonamemove-runmod2 \
tst-sprof-mod \
- tst-tls19mod1 \
- tst-tls19mod2 \
- tst-tls19mod3 \
- tst-tls20mod-bad \
- tst-tls21mod \
- tst-tlsalign-lib \
tst-tls-ie-mod0 \
tst-tls-ie-mod1 \
tst-tls-ie-mod2 \
@@ -876,6 +870,12 @@ modules-names += \
tst-tls-ie-mod4 \
tst-tls-ie-mod5 \
tst-tls-ie-mod6 \
+ tst-tls19mod1 \
+ tst-tls19mod2 \
+ tst-tls19mod3 \
+ tst-tls20mod-bad \
+ tst-tls21mod \
+ tst-tlsalign-lib \
tst-tlsmod1 \
tst-tlsmod10 \
tst-tlsmod11 \
@@ -925,7 +925,7 @@ modules-names += \
vismod1 \
vismod2 \
vismod3 \
-# modules-names
+ # modules-names
modules-names-cxx = \
tst-dlopen-nodelete-reloc-mod1 \
@@ -1015,22 +1015,22 @@ modules-names-nobuild += \
tst-audit24bmod2 \
tst-big-note-lib \
tst-ro-dynamic-mod \
-# modules-names-nobuild
+ # modules-names-nobuild
tests += $(tests-static)
ifeq (yes,$(have-ifunc))
tests-ifuncstatic := \
- ifuncmain1static \
ifuncmain1picstatic \
- ifuncmain2static \
+ ifuncmain1static \
ifuncmain2picstatic \
- ifuncmain4static \
+ ifuncmain2static \
ifuncmain4picstatic \
- ifuncmain5static \
+ ifuncmain4static \
ifuncmain5picstatic \
- ifuncmain7static \
+ ifuncmain5static \
ifuncmain7picstatic \
+ ifuncmain7static \
# tests-ifuncstatic
ifeq (yes,$(have-gcc-ifunc))
tests-ifuncstatic += ifuncmain9static ifuncmain9picstatic
@@ -1143,13 +1143,13 @@ tests-special += \
$(objpfx)tst-array5-static-cmp.out \
$(objpfx)tst-initorder-cmp.out \
$(objpfx)tst-initorder2-cmp.out \
- $(objpfx)tst-unused-dep-cmp.out \
- $(objpfx)tst-unused-dep.out \
$(objpfx)tst-trace1.out \
$(objpfx)tst-trace2.out \
$(objpfx)tst-trace3.out \
$(objpfx)tst-trace4.out \
$(objpfx)tst-trace5.out \
+ $(objpfx)tst-unused-dep-cmp.out \
+ $(objpfx)tst-unused-dep.out \
# tests-special
endif
--
2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [COMMITTED 2/8] debug: Reformat Makefile.
2023-05-16 12:48 [COMMITTED 0/8] Reformat most used Makefiles Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 1/8] elf: Reformat Makefile Carlos O'Donell
@ 2023-05-16 12:48 ` Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 3/8] misc: " Carlos O'Donell
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Carlos O'Donell @ 2023-05-16 12:48 UTC (permalink / raw)
To: libc-alpha; +Cc: Carlos O'Donell
Fix list terminator whitspace.
Sort using scripts/sort-makefile-lines.py.
No code generation changes observed in binary artifacts.
No regressions on x86_64 and i686.
---
debug/Makefile | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/debug/Makefile b/debug/Makefile
index a8b4036cdc..096df27aeb 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -29,6 +29,7 @@ headers := execinfo.h
# login/Makefile instead. If that subdir is omitted from the
# build, its _FORTIFY_SOURCE support will be too.
routines = \
+ $(static-only-routines) \
____longjmp_chk \
asprintf_chk \
backtrace \
@@ -113,7 +114,6 @@ routines = \
wmempcpy_chk \
wmemset_chk \
wprintf_chk \
- $(static-only-routines) \
# routines
static-only-routines := stack_chk_fail_local
@@ -267,23 +267,25 @@ CFLAGS-tst-ssp-1.c += -fstack-protector-all
CFLAGS-tst-sprintf-fortify-unchecked.c = \
-fno-builtin-vsprintf -fno-builtin-__vsprintf_chk
-tests = backtrace-tst \
- tst-longjmp_chk \
- test-strcpy_chk \
- test-stpcpy_chk \
- tst-longjmp_chk2 \
- tst-backtrace2 \
- tst-backtrace3 \
- tst-backtrace4 \
- tst-backtrace5 \
- tst-backtrace6 \
- tst-realpath-chk \
- tst-sprintf-fortify-unchecked \
- $(tests-all-chk)
+tests = \
+ $(tests-all-chk) \
+ backtrace-tst \
+ test-stpcpy_chk \
+ test-strcpy_chk \
+ tst-backtrace2 \
+ tst-backtrace3 \
+ tst-backtrace4 \
+ tst-backtrace5 \
+ tst-backtrace6 \
+ tst-longjmp_chk \
+ tst-longjmp_chk2 \
+ tst-realpath-chk \
+ tst-sprintf-fortify-unchecked \
+ # tests
tests-time64 += \
- $(tests-all-time64-chk) \
- # tests-time64
+ $(tests-all-time64-chk) \
+ # tests-time64
ifeq ($(have-ssp),yes)
tests += tst-ssp-1
--
2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [COMMITTED 3/8] misc: Reformat Makefile.
2023-05-16 12:48 [COMMITTED 0/8] Reformat most used Makefiles Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 1/8] elf: Reformat Makefile Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 2/8] debug: " Carlos O'Donell
@ 2023-05-16 12:48 ` Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 4/8] socket: " Carlos O'Donell
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Carlos O'Donell @ 2023-05-16 12:48 UTC (permalink / raw)
To: libc-alpha; +Cc: Carlos O'Donell
Reflow Makefile.
Sort using scripts/sort-makefile-lines.py.
Code generation is changed as routines are linked in sorted order
as expected.
No regressions on x86_64 and i686.
---
misc/Makefile | 299 +++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 232 insertions(+), 67 deletions(-)
diff --git a/misc/Makefile b/misc/Makefile
index 9f42321206..1a21347f5e 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -23,79 +23,240 @@ subdir := misc
include ../Makeconfig
-headers := sys/uio.h bits/uio-ext.h bits/uio_lim.h \
- sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \
- sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \
- ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \
- ttyent.h paths.h sys/reboot.h \
- sys/mman.h sys/param.h bits/param.h \
- fstab.h mntent.h search.h err.h error.h \
- sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \
- sys/select.h sys/sysinfo.h \
- regexp.h bits/select.h bits/mman.h sys/xattr.h \
- syslog.h sys/syslog.h \
- bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \
- bits/select2.h bits/hwcap.h sys/auxv.h \
- sys/sysmacros.h bits/sysmacros.h bits/types/struct_iovec.h \
- bits/err-ldbl.h bits/error-ldbl.h \
- sys/single_threaded.h
-
-routines := brk sbrk sstk ioctl \
- readv writev preadv preadv64 pwritev pwritev64 \
- preadv2 preadv64v2 pwritev2 pwritev64v2 \
- setreuid setregid \
- seteuid setegid \
- getpagesize \
- getdtsz \
- gethostname sethostname getdomain setdomain \
- select pselect \
- acct chroot fsync sync fdatasync syncfs reboot \
- gethostid sethostid \
- revoke vhangup \
- swapon swapoff mktemp mkstemp mkstemp64 mkdtemp \
- mkostemp mkostemp64 mkstemps mkstemps64 mkostemps mkostemps64 \
- ualarm usleep \
- gtty stty \
- ptrace \
- fstab mntent mntent_r \
- utimes lutimes futimes futimesat \
- truncate ftruncate truncate64 ftruncate64 \
- chflags fchflags \
- insremque getttyent getusershell getpass ttyslot \
- syslog syscall daemon \
- mmap mmap64 munmap mprotect msync madvise mincore remap_file_pages\
- mlock munlock mlockall munlockall \
- efgcvt efgcvt_r qefgcvt qefgcvt_r \
- hsearch hsearch_r tsearch lsearch \
- err error ustat \
- getsysstats dirname regexp \
- getloadavg getclktck \
- fgetxattr flistxattr fremovexattr fsetxattr getxattr \
- listxattr lgetxattr llistxattr lremovexattr lsetxattr \
- removexattr setxattr getauxval ifunc-impl-list makedev \
- allocate_once fd_to_filename single_threaded unwind-link \
- atomic_wide_counter
-
-generated += tst-error1.mtrace tst-error1-mem.out \
- tst-allocate_once.mtrace tst-allocate_once-mem.out
+headers := \
+ sys/uio.h \
+ bits/uio-ext.h \
+ bits/uio_lim.h \
+ sys/ioctl.h \
+ bits/ioctls.h \
+ bits/ioctl-types.h \
+ sys/ptrace.h \
+ sys/file.h \
+ sys/dir.h \
+ sys/cdefs.h \
+ ar.h \
+ a.out.h \
+ libgen.h \
+ stab.h \
+ bits/stab.def \
+ sgtty.h \
+ ttyent.h \
+ paths.h \
+ sys/reboot.h \
+ sys/mman.h \
+ sys/param.h \
+ bits/param.h \
+ fstab.h \
+ mntent.h \
+ search.h \
+ err.h \
+ error.h \
+ sys/queue.h \
+ sysexits.h \
+ syscall.h \
+ sys/syscall.h \
+ sys/swap.h \
+ sys/select.h \
+ sys/sysinfo.h \
+ regexp.h \
+ bits/select.h \
+ bits/mman.h \
+ sys/xattr.h \
+ syslog.h \
+ sys/syslog.h \
+ bits/syslog.h \
+ bits/syslog-ldbl.h \
+ bits/syslog-path.h \
+ bits/error.h \
+ bits/select2.h \
+ bits/hwcap.h \
+ sys/auxv.h \
+ sys/sysmacros.h \
+ bits/sysmacros.h \
+ bits/types/struct_iovec.h \
+ bits/err-ldbl.h \
+ bits/error-ldbl.h \
+ sys/single_threaded.h \
+ # headers
+
+routines := \
+ acct \
+ allocate_once \
+ atomic_wide_counter \
+ brk \
+ chflags \
+ chroot \
+ daemon \
+ dirname \
+ efgcvt \
+ efgcvt_r \
+ err \
+ error \
+ fchflags \
+ fd_to_filename \
+ fdatasync \
+ fgetxattr \
+ flistxattr \
+ fremovexattr \
+ fsetxattr \
+ fstab \
+ fsync \
+ ftruncate \
+ ftruncate64 \
+ futimes \
+ futimesat \
+ getauxval \
+ getclktck \
+ getdomain \
+ getdtsz \
+ gethostid \
+ gethostname \
+ getloadavg \
+ getpagesize \
+ getpass \
+ getsysstats \
+ getttyent \
+ getusershell \
+ getxattr \
+ gtty \
+ hsearch \
+ hsearch_r \
+ ifunc-impl-list \
+ insremque \
+ ioctl \
+ lgetxattr \
+ listxattr \
+ llistxattr \
+ lremovexattr \
+ lsearch \
+ lsetxattr \
+ lutimes \
+ madvise \
+ makedev \
+ mincore \
+ mkdtemp \
+ mkostemp \
+ mkostemp64 \
+ mkostemps \
+ mkostemps64 \
+ mkstemp \
+ mkstemp64 \
+ mkstemps \
+ mkstemps64 \
+ mktemp \
+ mlock \
+ mlockall \
+ mmap \
+ mmap64 \
+ mntent \
+ mntent_r \
+ mprotect \
+ msync \
+ munlock \
+ munlockall \
+ munmap \
+ preadv \
+ preadv64 \
+ preadv2 \
+ preadv64v2 \
+ pselect \
+ ptrace \
+ pwritev \
+ pwritev64 \
+ pwritev2 \
+ pwritev64v2 \
+ qefgcvt \
+ qefgcvt_r \
+ readv \
+ reboot \
+ regexp \
+ remap_file_pages \
+ removexattr \
+ revoke \
+ sbrk \
+ select \
+ setdomain \
+ setegid \
+ seteuid \
+ sethostid \
+ sethostname \
+ setregid \
+ setreuid \
+ setxattr \
+ single_threaded \
+ sstk \
+ stty \
+ swapoff \
+ swapon \
+ sync \
+ syncfs \
+ syscall \
+ syslog \
+ truncate \
+ truncate64 \
+ tsearch \
+ ttyslot \
+ ualarm \
+ unwind-link \
+ usleep \
+ ustat \
+ utimes \
+ vhangup \
+ writev \
+ # routines
+
+generated += \
+ tst-allocate_once-mem.out \
+ tst-allocate_once.mtrace \
+ tst-error1-mem.out \
+ tst-error1.mtrace \
+ # generated
aux := init-misc
install-lib := libg.a
-gpl2lgpl := error.c error.h
-tests := tst-dirname tst-tsearch tst-fdset tst-mntent tst-hsearch \
- tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \
- tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \
- tst-preadvwritev tst-preadvwritev64 tst-makedev tst-empty \
- tst-preadvwritev2 tst-preadvwritev64v2 tst-warn-wide \
- tst-ldbl-warn tst-ldbl-error tst-dbl-efgcvt tst-ldbl-efgcvt \
- tst-mntent-autofs tst-syscalls tst-mntent-escape tst-select \
- tst-ioctl tst-ldbl-errorfptr
+gpl2lgpl := \
+ error.c \
+ error.h \
+ # gpl2lgpl
+
+tests := \
+ bug-hsearch1 \
+ bug18240 \
+ tst-dbl-efgcvt \
+ tst-dirname \
+ tst-empty \
+ tst-error1 \
+ tst-fdset \
+ tst-hsearch \
+ tst-insremque \
+ tst-ioctl \
+ tst-ldbl-efgcvt \
+ tst-ldbl-error \
+ tst-ldbl-errorfptr \
+ tst-ldbl-warn \
+ tst-makedev \
+ tst-mntent \
+ tst-mntent-autofs \
+ tst-mntent-blank-corrupt \
+ tst-mntent-blank-passno \
+ tst-mntent-escape \
+ tst-mntent2 \
+ tst-preadvwritev \
+ tst-preadvwritev64 \
+ tst-preadvwritev2 \
+ tst-preadvwritev64v2 \
+ tst-pselect \
+ tst-select \
+ tst-syscalls \
+ tst-tsearch \
+ tst-warn-wide \
+ # tests
tests-time64 := \
- tst-select-time64 \
- tst-pselect-time64 \
tst-ioctl-time64 \
+ tst-pselect-time64 \
+ tst-select-time64 \
# tests-time64
# Tests which need libdl.
@@ -103,7 +264,11 @@ ifeq (yes,$(build-shared))
tests += tst-gethostid
endif
-tests-internal := tst-atomic tst-atomic-long tst-allocate_once
+tests-internal := \
+ tst-allocate_once \
+ tst-atomic \
+ tst-atomic-long \
+ # tests-internal
tests-static := tst-empty
# Test for the internal, non-exported __fd_to_filename function.
--
2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [COMMITTED 4/8] socket: Reformat Makefile.
2023-05-16 12:48 [COMMITTED 0/8] Reformat most used Makefiles Carlos O'Donell
` (2 preceding siblings ...)
2023-05-16 12:48 ` [COMMITTED 3/8] misc: " Carlos O'Donell
@ 2023-05-16 12:48 ` Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 5/8] stdio-common: " Carlos O'Donell
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Carlos O'Donell @ 2023-05-16 12:48 UTC (permalink / raw)
To: libc-alpha; +Cc: Carlos O'Donell
Reflow Makefile.
Sort using scripts/sort-makefile-lines.py.
Code generation is changed as routines are linked in sorted order
as expected.
No regressions on x86_64 and i686.
---
socket/Makefile | 47 ++++++++++++++++++++++++++++++++++++++---------
1 file changed, 38 insertions(+), 9 deletions(-)
diff --git a/socket/Makefile b/socket/Makefile
index 94951ae3e7..d9b0b4af64 100644
--- a/socket/Makefile
+++ b/socket/Makefile
@@ -22,20 +22,49 @@ subdir := socket
include ../Makeconfig
-headers := sys/socket.h sys/un.h bits/sockaddr.h bits/socket.h \
- bits/socket2.h bits/types/struct_osockaddr.h \
- sys/socketvar.h net/if.h
+headers := \
+ bits/sockaddr.h \
+ bits/socket.h \
+ bits/socket2.h \
+ bits/types/struct_osockaddr.h \
+ net/if.h \
+ sys/socket.h \
+ sys/socketvar.h \
+ sys/un.h \
+ # headers
-routines := accept bind connect getpeername getsockname getsockopt \
- listen recv recvfrom recvmsg send sendmsg sendto \
- setsockopt shutdown socket socketpair isfdtype opensock \
- sockatmark accept4 recvmmsg sendmmsg sockaddr_un_set
+routines := \
+ accept \
+ accept4 \
+ bind \
+ connect \
+ getpeername \
+ getsockname \
+ getsockopt \
+ isfdtype \
+ listen \
+ opensock \
+ recv \
+ recvfrom \
+ recvmmsg \
+ recvmsg \
+ send \
+ sendmmsg \
+ sendmsg \
+ sendto \
+ setsockopt \
+ shutdown \
+ sockaddr_un_set \
+ sockatmark \
+ socket \
+ socketpair \
+ # routines
tests := \
tst-accept4 \
- tst-sockopt \
- tst-cmsghdr \
tst-cmsg_cloexec \
+ tst-cmsghdr \
+ tst-sockopt \
# tests
tests-internal := \
--
2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [COMMITTED 5/8] stdio-common: Reformat Makefile.
2023-05-16 12:48 [COMMITTED 0/8] Reformat most used Makefiles Carlos O'Donell
` (3 preceding siblings ...)
2023-05-16 12:48 ` [COMMITTED 4/8] socket: " Carlos O'Donell
@ 2023-05-16 12:48 ` Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 6/8] stdlib: " Carlos O'Donell
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Carlos O'Donell @ 2023-05-16 12:48 UTC (permalink / raw)
To: libc-alpha; +Cc: Carlos O'Donell
Reflow Makefile.
Sort using scripts/sort-makefile-lines.py.
Code generation is changed as routines are linked in sorted order
as expected.
No regressions on x86_64 and i686.
---
stdio-common/Makefile | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 7cf8d814ea..1b4997afc8 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -22,7 +22,12 @@ subdir := stdio-common
include ../Makeconfig
-headers := stdio_ext.h printf.h bits/printf-ldbl.h bits/stdio_lim.h
+headers := \
+ bits/printf-ldbl.h \
+ bits/stdio_lim.h \
+ printf.h \
+ stdio_ext.h \
+ # headers
routines := \
_itoa \
@@ -41,18 +46,18 @@ routines := \
getw \
grouping_iterator \
iovfscanf \
- isoc99_fscanf \
- isoc99_scanf \
- isoc99_sscanf \
- isoc99_vfscanf \
- isoc99_vscanf \
- isoc99_vsscanf \
isoc23_fscanf \
isoc23_scanf \
isoc23_sscanf \
isoc23_vfscanf \
isoc23_vscanf \
isoc23_vsscanf \
+ isoc99_fscanf \
+ isoc99_scanf \
+ isoc99_sscanf \
+ isoc99_vfscanf \
+ isoc99_vscanf \
+ isoc99_vsscanf \
itoa-digits \
itoa-udigits \
itowa-digits \
@@ -238,9 +243,9 @@ tests := \
tst-unlockedio \
tst-vfprintf-mbs-prec \
tst-vfprintf-user-type \
+ tst-vfprintf-width-i18n \
tst-vfprintf-width-prec \
tst-vfprintf-width-prec-alloc \
- tst-vfprintf-width-i18n \
tst-wc-printf \
tstdiomisc \
tstgetln \
@@ -250,6 +255,7 @@ tests := \
tests-container += \
tst-popen3
+ # tests-container
generated += \
errlist-data-aux-shared.S \
@@ -262,7 +268,11 @@ tests-internal = \
tst-grouping_iterator \
# tests-internal
-test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble
+test-srcs = \
+ tst-printf \
+ tst-printfsz-islongdouble \
+ tst-unbputc \
+ # test-srcs
ifeq ($(run-built-tests),yes)
tests-special += \
@@ -340,7 +350,7 @@ LOCALES := \
ja_JP.EUC-JP \
ps_AF.UTF-8 \
tg_TJ.UTF-8 \
- # LOCALES
+ # LOCALES
include ../gen-locales.mk
$(objpfx)bug14.out: $(gen-locales)
--
2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [COMMITTED 6/8] stdlib: Reformat Makefile.
2023-05-16 12:48 [COMMITTED 0/8] Reformat most used Makefiles Carlos O'Donell
` (4 preceding siblings ...)
2023-05-16 12:48 ` [COMMITTED 5/8] stdio-common: " Carlos O'Donell
@ 2023-05-16 12:48 ` Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 7/8] linux: " Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 8/8] wcsmbs: " Carlos O'Donell
7 siblings, 0 replies; 9+ messages in thread
From: Carlos O'Donell @ 2023-05-16 12:48 UTC (permalink / raw)
To: libc-alpha; +Cc: Carlos O'Donell
Reflow Makefile.
Sort using scripts/sort-makefile-lines.py.
No code generation changes observed in binary artifacts.
No regressions on x86_64 and i686.
---
stdlib/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 5e38f0e6a2..59ffed79b9 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -31,8 +31,8 @@ headers := \
bits/stdint-uintn.h \
bits/stdlib-bsearch.h \
bits/stdlib-float.h \
- bits/stdlib.h \
bits/stdlib-ldbl.h \
+ bits/stdlib.h \
bits/time64.h \
bits/timesize.h \
bits/types/error_t.h \
@@ -59,7 +59,7 @@ routines := \
atof \
atoi \
atol\
- atoll \
+ atoll \
bsearch \
canonicalize \
cxa_at_quick_exit \
@@ -155,8 +155,8 @@ aux = \
# Instead the static object files will be included in a special archive
# linked against when the shared library will be used.
static-only-routines = \
- atexit \
at_quick_exit \
+ atexit \
# static-only-routines
test-srcs := \
--
2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [COMMITTED 7/8] linux: Reformat Makefile.
2023-05-16 12:48 [COMMITTED 0/8] Reformat most used Makefiles Carlos O'Donell
` (5 preceding siblings ...)
2023-05-16 12:48 ` [COMMITTED 6/8] stdlib: " Carlos O'Donell
@ 2023-05-16 12:48 ` Carlos O'Donell
2023-05-16 12:48 ` [COMMITTED 8/8] wcsmbs: " Carlos O'Donell
7 siblings, 0 replies; 9+ messages in thread
From: Carlos O'Donell @ 2023-05-16 12:48 UTC (permalink / raw)
To: libc-alpha; +Cc: Carlos O'Donell
Reflow Makefile.
Sort using scripts/sort-makefile-lines.py.
No code generation changes observed in binary artifacts.
No regressions on x86_64 and i686.
---
sysdeps/unix/sysv/linux/Makefile | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index e73684d443..594a5dc53e 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -6,8 +6,8 @@ sysdeps-linux-python-cc = \
# Additional dependencies for Python scripts.
sysdeps-linux-python-deps = \
- $(..)sysdeps/unix/sysv/linux/glibcsyscalls.py \
$(..)scripts/glibcextract.py \
+ $(..)sysdeps/unix/sysv/linux/glibcsyscalls.py \
# sysdeps-linux-python-deps
# Invocation of the Python interpreter with the Python search path.
@@ -109,7 +109,7 @@ sysdep_routines += \
xmknodat \
xstat \
xstat64 \
- # sysdeps-routines
+ # sysdep_routines
CFLAGS-gethostid.c = -fexceptions
CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables
@@ -185,7 +185,7 @@ sysdep_headers += \
sys/timerfd.h \
sys/user.h \
sys/vt.h \
- # sysdep-headers
+ # sysdep_headers
tests += \
test-errno-linux \
@@ -261,10 +261,10 @@ tests-time64 += \
tst-ntp_gettime-time64 \
tst-ntp_gettimex-time64 \
tst-ppoll-time64 \
- tst-sigtimedwait-time64 \
- tst-timerfd-time64 \
tst-prctl-time64 \
tst-scm_rights-time64 \
+ tst-sigtimedwait-time64 \
+ tst-timerfd-time64 \
# tests-time64
tests-clone-internal = \
@@ -272,6 +272,7 @@ tests-clone-internal = \
tst-clone2-internal \
tst-clone3-internal \
tst-getpid1-internal
+ # tests-clone-internal
tests-internal += \
$(tests-clone-internal) \
# tests-internal
@@ -451,8 +452,8 @@ tests += \
tst-socket-timestamp-compat \
# tests
tests-time64 += \
+ tst-socket-timestamp-compat-time64 \
tst-socket-timestamp-time64 \
- tst-socket-timestamp-compat-time64
# tests-time64
tests-special += \
--
2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [COMMITTED 8/8] wcsmbs: Reformat Makefile.
2023-05-16 12:48 [COMMITTED 0/8] Reformat most used Makefiles Carlos O'Donell
` (6 preceding siblings ...)
2023-05-16 12:48 ` [COMMITTED 7/8] linux: " Carlos O'Donell
@ 2023-05-16 12:48 ` Carlos O'Donell
7 siblings, 0 replies; 9+ messages in thread
From: Carlos O'Donell @ 2023-05-16 12:48 UTC (permalink / raw)
To: libc-alpha; +Cc: Carlos O'Donell
Reflow Makefile.
Sort using scripts/sort-makefile-lines.py.
No code generation changes observed in binary artifacts.
No regressions on x86_64 and i686.
---
wcsmbs/Makefile | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index 0dc264e971..347b44841e 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -22,9 +22,17 @@ subdir := wcsmbs
include ../Makeconfig
-headers := wchar.h bits/wchar.h bits/wchar2.h bits/wchar2-decl.h \
- bits/wchar-ldbl.h uchar.h bits/types/__mbstate_t.h \
- bits/types/mbstate_t.h bits/types/wint_t.h
+headers := \
+ bits/types/__mbstate_t.h \
+ bits/types/mbstate_t.h \
+ bits/types/wint_t.h \
+ bits/wchar-ldbl.h \
+ bits/wchar.h \
+ bits/wchar2-decl.h \
+ bits/wchar2.h \
+ uchar.h \
+ wchar.h \
+ # headers
routines := \
btowc \
@@ -123,11 +131,11 @@ tests := \
test-wcscmp \
test-wcscpy \
test-wcscspn \
+ test-wcsdup \
test-wcslen \
test-wcsncat \
test-wcsncmp \
test-wcsncpy \
- test-wcsdup \
test-wcsnlen \
test-wcspbrk \
test-wcsrchr \
@@ -169,8 +177,17 @@ tests := \
include ../Rules
ifeq ($(run-built-tests),yes)
-LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 hr_HR.ISO-8859-2 \
- ja_JP.EUC-JP zh_TW.EUC-TW tr_TR.UTF-8 tr_TR.ISO-8859-9 zh_HK.BIG5-HKSCS
+LOCALES := \
+ de_DE.ISO-8859-1 \
+ de_DE.UTF-8 \
+ en_US.ANSI_X3.4-1968 \
+ hr_HR.ISO-8859-2 \
+ ja_JP.EUC-JP \
+ tr_TR.ISO-8859-9 \
+ tr_TR.UTF-8 \
+ zh_HK.BIG5-HKSCS \
+ zh_TW.EUC-TW \
+ # LOCALES
include ../gen-locales.mk
$(objpfx)tst-btowc.out: $(gen-locales)
--
2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread