public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Carlos O'Donell <carlos@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] csu: Reformat Makefile. Date: Sun, 25 Feb 2024 18:42:13 +0000 (GMT) [thread overview] Message-ID: <20240225184217.BF2D63858D39@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d88fcccb1a07d071d366d352e126c98c72380660 commit d88fcccb1a07d071d366d352e126c98c72380660 Author: Carlos O'Donell <carlos@redhat.com> Date: Tue Jun 6 08:27:20 2023 -0400 csu: Reformat Makefile. Reflow and sort Makefile. Code generation changes present due to link order changes. No regressions on x86_64 and i686. Diff: --- 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
reply other threads:[~2024-02-25 18:42 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240225184217.BF2D63858D39@sourceware.org \ --to=carlos@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).