[PATCH] s390: Enabling lint-makefiles
Adhemerval Zanella Netto
adhemerval.zanella@linaro.org
Mon May 25 13:11:17 GMT 2026
On 21/05/26 09:07, Stefan Liebler wrote:
> The s390 specific Makefiles were adjusted to match the required format
> for scripts/lint-makefiles.sh / scripts/sort-makefile-lines.py.
>
> Afterwards the lines were sorted by those scripts.
> And the testcase lint-makefiles is passing.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> sysdeps/s390/Makefile | 213 +++++++++++++++++++-------
> sysdeps/s390/multiarch/Makefile | 4 +-
> sysdeps/s390/nptl/Makefile | 4 +-
> sysdeps/unix/sysv/linux/s390/Makefile | 33 +++-
> 4 files changed, 192 insertions(+), 62 deletions(-)
>
> diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
> index 85446ca0b3..481e834792 100644
> --- a/sysdeps/s390/Makefile
> +++ b/sysdeps/s390/Makefile
> @@ -1,5 +1,7 @@
> ifeq ($(subdir),gmon)
> -sysdep_routines += s390x-mcount
> +sysdep_routines += \
> + s390x-mcount \
> + # sysdep_routines
> endif
>
> ifeq ($(subdir),iconvdata)
> @@ -15,7 +17,12 @@ UTF16_UTF32_Z9-map := gconv.map
> UTF8_UTF16_Z9-routines := utf8-utf16-z9
> UTF8_UTF16_Z9-map := gconv.map
>
> -s390x-iconv-modules = ISO-8859-1_CP037_Z900 UTF8_UTF16_Z9 UTF16_UTF32_Z9 UTF8_UTF32_Z9
> +s390x-iconv-modules = \
> + ISO-8859-1_CP037_Z900 \
> + UTF16_UTF32_Z9 \
> + UTF8_UTF16_Z9 \
> + UTF8_UTF32_Z9 \
> + # s390x-iconv-modules
>
> extra-modules-left += $(s390x-iconv-modules)
> include extra-module.mk
> @@ -34,7 +41,9 @@ $(inst_gconvdir)/%.so: $(objpfx)%.so $(+force)
> $(do-install-program)
>
> ifdef objpfx
> -generated += gconv-modules.d/gconv-modules-s390.conf
> +generated += \
> + gconv-modules.d/gconv-modules-s390.conf \
> + # generated
> endif
>
> $(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf: \
> @@ -126,15 +135,22 @@ $(objpfx)glibc-hwcaps/z17/libmarkermod6.so: $(objpfx)libmarkermod6-6.so
> ifeq (no,$(build-hardcoded-path-in-tests))
> # This is an ld.so.cache test, and RPATH/RUNPATH in the executable
> # interferes with its test objectives.
> -tests-container += tst-glibc-hwcaps-cache
> +tests-container += \
> + tst-glibc-hwcaps-cache \
> + # tests-container
> endif
>
> ifeq ($(build-shared),yes)
> -tests += tst-dl-runtime-resolve-noaudit tst-dl-runtime-resolve-audit \
> - tst-dl-runtime-profile-noaudit
> +tests += \
> + tst-dl-runtime-profile-noaudit \
> + tst-dl-runtime-resolve-audit \
> + tst-dl-runtime-resolve-noaudit \
> + # tests
> # FIXME: When both LD_PROFILE and LD_AUDIT are set, a segfault occurs.
> #tests += tst-dl-runtime-profile-audit
> -modules-names += tst-dl-runtime-mod
> +modules-names += \
> + tst-dl-runtime-mod \
> + # modules-names
> $(objpfx)tst-dl-runtime-resolve-noaudit: $(objpfx)tst-dl-runtime-mod.so
> $(objpfx)tst-dl-runtime-resolve-audit: $(objpfx)tst-dl-runtime-mod.so
> $(objpfx)tst-dl-runtime-profile-noaudit: $(objpfx)tst-dl-runtime-mod.so
> @@ -152,32 +168,85 @@ endif
> endif
>
> ifeq ($(subdir),string)
> -sysdep_routines += memset memset-z900 \
> - memcmp memcmp-z900 \
> - mempcpy memcpy memcpy-z900 \
> - memmove memmove-c \
> - strstr strstr-arch13 strstr-vx strstr-c \
> - memmem memmem-arch13 memmem-vx memmem-c \
> - strlen strlen-vx strlen-c \
> - strnlen strnlen-vx strnlen-c \
> - strcpy strcpy-vx strcpy-z900 \
> - stpcpy stpcpy-vx stpcpy-c \
> - strncpy strncpy-vx strncpy-z900 \
> - stpncpy stpncpy-vx stpncpy-c \
> - strcat strcat-vx strcat-c \
> - strncat strncat-vx strncat-c \
> - strcmp strcmp-vx strcmp-z900 \
> - strncmp strncmp-vx strncmp-c \
> - strchr strchr-vx strchr-c \
> - strchrnul strchrnul-vx strchrnul-c \
> - strrchr strrchr-vx strrchr-c \
> - strspn strspn-vx strspn-c \
> - strpbrk strpbrk-vx strpbrk-c \
> - strcspn strcspn-vx strcspn-c \
> - memchr memchr-vx memchr-z900 \
> - rawmemchr rawmemchr-vx rawmemchr-c \
> - memccpy memccpy-vx memccpy-c \
> - memrchr memrchr-vx memrchr-c
> +sysdep_routines += \
> + memccpy \
> + memccpy-c \
> + memccpy-vx \
> + memchr \
> + memchr-vx \
> + memchr-z900 \
> + memcmp \
> + memcmp-z900 \
> + memcpy \
> + memcpy-z900 \
> + memmem \
> + memmem-arch13 \
> + memmem-c \
> + memmem-vx \
> + memmove \
> + memmove-c \
> + mempcpy \
> + memrchr \
> + memrchr-c \
> + memrchr-vx \
> + memset \
> + memset-z900 \
> + rawmemchr \
> + rawmemchr-c \
> + rawmemchr-vx \
> + stpcpy \
> + stpcpy-c \
> + stpcpy-vx \
> + stpncpy \
> + stpncpy-c \
> + stpncpy-vx \
> + strcat \
> + strcat-c \
> + strcat-vx \
> + strchr \
> + strchr-c \
> + strchr-vx \
> + strchrnul \
> + strchrnul-c \
> + strchrnul-vx \
> + strcmp \
> + strcmp-vx \
> + strcmp-z900 \
> + strcpy \
> + strcpy-vx \
> + strcpy-z900 \
> + strcspn \
> + strcspn-c \
> + strcspn-vx \
> + strlen \
> + strlen-c \
> + strlen-vx \
> + strncat \
> + strncat-c \
> + strncat-vx \
> + strncmp \
> + strncmp-c \
> + strncmp-vx \
> + strncpy \
> + strncpy-vx \
> + strncpy-z900 \
> + strnlen \
> + strnlen-c \
> + strnlen-vx \
> + strpbrk \
> + strpbrk-c \
> + strpbrk-vx \
> + strrchr \
> + strrchr-c \
> + strrchr-vx \
> + strspn \
> + strspn-c \
> + strspn-vx \
> + strstr \
> + strstr-arch13 \
> + strstr-c \
> + strstr-vx \
> + # sysdep_routines
>
> # Exclude fortified routines from being built with _FORTIFY_SOURCE
> routines_no_fortify += \
> @@ -190,25 +259,65 @@ routines_no_fortify += \
> endif
>
> ifeq ($(subdir),wcsmbs)
> -sysdep_routines += wcslen wcslen-vx wcslen-c \
> - wcsnlen wcsnlen-vx wcsnlen-c \
> - wcscpy wcscpy-vx wcscpy-c \
> - wcpcpy wcpcpy-vx wcpcpy-c \
> - wcsncpy wcsncpy-vx wcsncpy-c \
> - wcpncpy wcpncpy-vx wcpncpy-c \
> - wcscat wcscat-vx wcscat-c \
> - wcsncat wcsncat-vx wcsncat-c \
> - wcscmp wcscmp-vx wcscmp-c \
> - wcsncmp wcsncmp-vx wcsncmp-c \
> - wcschr wcschr-vx wcschr-c \
> - wcschrnul wcschrnul-vx wcschrnul-c \
> - wcsrchr wcsrchr-vx wcsrchr-c \
> - wcsspn wcsspn-vx wcsspn-c \
> - wcspbrk wcspbrk-vx wcspbrk-c \
> - wcscspn wcscspn-vx wcscspn-c \
> - wmemchr wmemchr-vx wmemchr-c \
> - wmemset wmemset-vx wmemset-c \
> - wmemcmp wmemcmp-vx wmemcmp-c
> +sysdep_routines += \
> + wcpcpy \
> + wcpcpy-c \
> + wcpcpy-vx \
> + wcpncpy \
> + wcpncpy-c \
> + wcpncpy-vx \
> + wcscat \
> + wcscat-c \
> + wcscat-vx \
> + wcschr \
> + wcschr-c \
> + wcschr-vx \
> + wcschrnul \
> + wcschrnul-c \
> + wcschrnul-vx \
> + wcscmp \
> + wcscmp-c \
> + wcscmp-vx \
> + wcscpy \
> + wcscpy-c \
> + wcscpy-vx \
> + wcscspn \
> + wcscspn-c \
> + wcscspn-vx \
> + wcslen \
> + wcslen-c \
> + wcslen-vx \
> + wcsncat \
> + wcsncat-c \
> + wcsncat-vx \
> + wcsncmp \
> + wcsncmp-c \
> + wcsncmp-vx \
> + wcsncpy \
> + wcsncpy-c \
> + wcsncpy-vx \
> + wcsnlen \
> + wcsnlen-c \
> + wcsnlen-vx \
> + wcspbrk \
> + wcspbrk-c \
> + wcspbrk-vx \
> + wcsrchr \
> + wcsrchr-c \
> + wcsrchr-vx \
> + wcsspn \
> + wcsspn-c \
> + wcsspn-vx \
> + wmemchr \
> + wmemchr-c \
> + wmemchr-vx \
> + wmemcmp \
> + wmemcmp-c \
> + wmemcmp-vx \
> + wmemset \
> + wmemset-c \
> + wmemset-vx \
> + # sysdep_routines
>
> # Exclude fortified routines from being built with _FORTIFY_SOURCE
> routines_no_fortify += \
> diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
> index fec3615304..9cc70fd49e 100644
> --- a/sysdeps/s390/multiarch/Makefile
> +++ b/sysdeps/s390/multiarch/Makefile
> @@ -9,5 +9,7 @@ endef
> endif
>
> ifeq ($(subdir),iconv)
> -sysdep_routines += gconv_simple
> +sysdep_routines += \
> + gconv_simple \
> + # sysdep_routines
> endif
> diff --git a/sysdeps/s390/nptl/Makefile b/sysdeps/s390/nptl/Makefile
> index 94b759df1f..ef845854d9 100644
> --- a/sysdeps/s390/nptl/Makefile
> +++ b/sysdeps/s390/nptl/Makefile
> @@ -16,5 +16,7 @@
> # <https://www.gnu.org/licenses/>.
>
> ifeq ($(subdir),csu)
> -gen-as-const-headers += tcb-offsets.sym
> +gen-as-const-headers += \
> + tcb-offsets.sym \
> + # gen-as-const-headers
> endif
> diff --git a/sysdeps/unix/sysv/linux/s390/Makefile b/sysdeps/unix/sysv/linux/s390/Makefile
> index e9ef5c51ac..3033290998 100644
> --- a/sysdeps/unix/sysv/linux/s390/Makefile
> +++ b/sysdeps/unix/sysv/linux/s390/Makefile
> @@ -1,22 +1,39 @@
> ifeq ($(subdir),elf)
> ifeq (yes,$(build-shared))
> # This is needed to support g++ v2 and v3.
> -sysdep_routines += framestate
> -shared-only-routines += framestate
> +sysdep_routines += \
> + framestate \
> + # sysdep_routines
> +shared-only-routines += \
> + framestate \
> + # shared-only-routines
> endif
> endif
>
> ifeq ($(subdir),rt)
> -librt-routines += rt-sysdep
> -librt-shared-only-routines += rt-sysdep
> +librt-routines += \
> + rt-sysdep \
> + # librt-routines
> +
> +librt-shared-only-routines += \
> + rt-sysdep \
> + # librt-shared-only-routines
> endif
>
> ifeq ($(subdir),stdlib)
> -gen-as-const-headers += ucontext_i.sym
> -sysdep_routines += __makecontext_ret
> +gen-as-const-headers += \
> + ucontext_i.sym \
> + # gen-as-const-headers
> +sysdep_routines += \
> + __makecontext_ret \
> + # sysdep_routines
> endif
>
> ifeq ($(subdir),misc)
> -tests += tst-ptrace-singleblock
> -sysdep_headers += sys/elf.h
> +tests += \
> + tst-ptrace-singleblock \
> + # tests
> +sysdep_headers += \
> + sys/elf.h \
> + # sysdep_headers
> endif
More information about the Libc-alpha
mailing list