This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Place $(elf-objpfx)sofini.os the last [BZ #22051]
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Thu, 31 Aug 2017 03:52:03 -0700
- Subject: [PATCH] Place $(elf-objpfx)sofini.os the last [BZ #22051]
- Authentication-results: sourceware.org; auth=none
Since sofini.os terminates .eh_frame section, it should be placed the
last.
Tested on x86-64. OK for master?
H.J.
---
[BZ #22051]
* Makerules (build-module-helper-objlist): Filter out
$(elf-objpfx)sofini.os.
(build-shlib-objlist): Append $(elf-objpfx)sofini.os if it is
needed.
---
Makerules | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makerules b/Makerules
index 8f1324d8e9..76f3c84ad4 100644
--- a/Makerules
+++ b/Makerules
@@ -686,14 +686,17 @@ $(build-module-helper) -o $@ $(shlib-lds-flags) \
$(call after-link,$@)
endef
+# sofini.os must be the last since it terminates .eh_frame section.
build-module-helper-objlist = \
$(patsubst %_pic.a,$(whole-archive) %_pic.a $(no-whole-archive),\
$(filter-out %.lds $(map-file) $(+preinit) $(+postinit) \
+ $(elf-objpfx)sofini.os \
$(link-libc-deps),$^))
build-module-objlist = $(build-module-helper-objlist) $(LDLIBS-$(@F:%.so=%).so)
build-shlib-objlist = $(build-module-helper-objlist) \
- $(LDLIBS-$(@F:lib%.so=%).so)
+ $(LDLIBS-$(@F:lib%.so=%).so) \
+ $(filter $(elf-objpfx)sofini.os,$^)
# Don't try to use -lc when making libc.so itself.
# Also omits crti.o and crtn.o, which we do not want
--
2.13.5