forked from pool/glibc
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
|
2017-08-31 H.J. Lu <hongjiu.lu@intel.com>
|
||
|
|
|
||
|
|
[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.
|
||
|
|
|
||
|
|
Index: glibc-2.26/Makerules
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.26.orig/Makerules
|
||
|
|
+++ glibc-2.26/Makerules
|
||
|
|
@@ -686,14 +686,17 @@ $(build-module-helper) -o $@ $(shlib-lds
|
||
|
|
$(call after-link,$@)
|
||
|
|
endef
|
||
|
|
|
||
|
|
+# sofini.os must be placed 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
|