qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makeconfig: Move $(CC) to +link command variables 

This change is needed to add linker flags which come very early in the
command linke (before LDFLAGS) and are not applied to test programs
(only to installed programs).
This commit is contained in:
Florian Weimer 2019-04-26 07:16:47 +02:00
parent deacca0054
commit e30fb31c0a
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2019-04-26 Florian Weimer <fweimer@redhat.com>
* Makeconfig (+link-pie-before-libc): Remove $(CC).
(+link-pie, +link-pie-tests, +link-pie-printers-tests): Add $(CC).
(+link-static-before-libc): Remove $(CC).
(+link-static, +link-static-tests): Add $(CC).
(+link-before-libc): Remove $(CC).
(+link, +link-pie, +link-pie-printers): Add $(CC).
2019-04-25 David Abdurachmanov <david.abdurachmanov@gmail.com> 2019-04-25 David Abdurachmanov <david.abdurachmanov@gmail.com>
[BZ#24484] [BZ#24484]

28
Makeconfig
View File

@ -415,7 +415,7 @@ link-extra-libs-tests = $(libsupport)
# Command for linking PIE programs with the C library. # Command for linking PIE programs with the C library.
ifndef +link-pie ifndef +link-pie
+link-pie-before-libc = $(CC) $(if $($(@F)-no-pie),$(no-pie-ldflag),-pie) \ +link-pie-before-libc = $(if $($(@F)-no-pie),$(no-pie-ldflag),-pie) \
-Wl,-O1 -nostdlib -nostartfiles -o $@ \ -Wl,-O1 -nostdlib -nostartfiles -o $@ \
$(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
$(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \ $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
@ -428,23 +428,24 @@ ifndef +link-pie
$(link-extra-libs) $(link-extra-libs)
+link-pie-after-libc = $(+postctorS) $(+postinit) +link-pie-after-libc = $(+postctorS) $(+postinit)
define +link-pie define +link-pie
$(+link-pie-before-libc) $(rtld-LDFLAGS) $(link-extra-flags) $(link-libc) $(+link-pie-after-libc) $(CC) $(+link-pie-before-libc) $(rtld-LDFLAGS) $(link-extra-flags) \
$(link-libc) $(+link-pie-after-libc)
$(call after-link,$@) $(call after-link,$@)
endef endef
define +link-pie-tests define +link-pie-tests
$(+link-pie-before-libc) $(rtld-tests-LDFLAGS) $(link-libc-tests) \ $(CC) $(+link-pie-before-libc) $(rtld-tests-LDFLAGS) $(link-libc-tests) \
$(+link-pie-after-libc) $(+link-pie-after-libc)
$(call after-link,$@) $(call after-link,$@)
endef endef
define +link-pie-printers-tests define +link-pie-printers-tests
$(+link-pie-before-libc) $(built-rtld-LDFLAGS) $(link-libc-printers-tests) \ $(CC) $(+link-pie-before-libc) $(built-rtld-LDFLAGS) \
$(+link-pie-after-libc) $(link-libc-printers-tests) $(+link-pie-after-libc)
$(call after-link,$@) $(call after-link,$@)
endef endef
endif endif
# Command for statically linking programs with the C library. # Command for statically linking programs with the C library.
ifndef +link-static ifndef +link-static
+link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \ +link-static-before-libc = -nostdlib -nostartfiles -static -o $@ \
$(if $($(@F)-no-pie),$(no-pie-ldflag),$(default-pie-ldflag)) \ $(if $($(@F)-no-pie),$(no-pie-ldflag),$(default-pie-ldflag)) \
$(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
$(firstword $(CRT-$(@F)) $(csu-objpfx)$(real-static-start-installed-name)) \ $(firstword $(CRT-$(@F)) $(csu-objpfx)$(real-static-start-installed-name)) \
@ -456,11 +457,13 @@ ifndef +link-static
$(link-extra-libs-static) $(link-extra-libs-static)
+link-static-after-libc = $(+postctorT) $(+postinit) +link-static-after-libc = $(+postctorT) $(+postinit)
define +link-static define +link-static
$(+link-static-before-libc) $(link-extra-flags) $(link-libc-static) $(+link-static-after-libc) $(CC) $(+link-static-before-libc) $(link-extra-flags) $(link-libc-static) \
$(+link-static-after-libc)
$(call after-link,$@) $(call after-link,$@)
endef endef
define +link-static-tests define +link-static-tests
$(+link-static-before-libc) $(link-libc-static-tests) $(+link-static-after-libc) $(CC) $(+link-static-before-libc) $(link-libc-static-tests) \
$(+link-static-after-libc)
$(call after-link,$@) $(call after-link,$@)
endef endef
endif endif
@ -475,7 +478,7 @@ ifeq (yes,$(build-pie-default))
+link-tests = $(+link-pie-tests) +link-tests = $(+link-pie-tests)
+link-printers-tests = $(+link-pie-printers-tests) +link-printers-tests = $(+link-pie-printers-tests)
else # not build-pie-default else # not build-pie-default
+link-before-libc = $(CC) -nostdlib -nostartfiles -o $@ \ +link-before-libc = -nostdlib -nostartfiles -o $@ \
$(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
$(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \ $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
$(firstword $(CRT-$(@F)) $(csu-objpfx)$(start-installed-name)) \ $(firstword $(CRT-$(@F)) $(csu-objpfx)$(start-installed-name)) \
@ -487,16 +490,17 @@ else # not build-pie-default
$(link-extra-libs) $(link-extra-libs)
+link-after-libc = $(+postctor) $(+postinit) +link-after-libc = $(+postctor) $(+postinit)
define +link define +link
$(+link-before-libc) $(rtld-LDFLAGS) $(link-extra-flags) $(link-libc) $(+link-after-libc) $(CC) $(+link-before-libc) $(rtld-LDFLAGS) $(link-extra-flags) $(link-libc) \
$(+link-after-libc)
$(call after-link,$@) $(call after-link,$@)
endef endef
define +link-tests define +link-tests
$(+link-before-libc) $(rtld-tests-LDFLAGS) $(link-libc-tests) \ $(CC) $(+link-before-libc) $(rtld-tests-LDFLAGS) $(link-libc-tests) \
$(+link-after-libc) $(+link-after-libc)
$(call after-link,$@) $(call after-link,$@)
endef endef
define +link-printers-tests define +link-printers-tests
$(+link-before-libc) $(built-rtld-LDFLAGS) $(link-libc-printers-tests) \ $(CC) $(+link-before-libc) $(built-rtld-LDFLAGS) $(link-libc-printers-tests) \
$(+link-after-libc) $(+link-after-libc)
$(call after-link,$@) $(call after-link,$@)
endef endef