* sysdeps/unix/sysv/linux/i386/sigaction.c (restore, restore_rt):

	Declare these without `static', to avoid warning that we haven't
	defined them.

	* Makerules (build-module-helper-objlist): New variable,
	broken out of build-module.  Insert --whole-archive/--no-whole-archive
	immediately each *_pic.a file in the link object list.
	(whole-archive): New variable, used by that.
	(build-module-objlist): New variable using build-module-helper-objlist.
	(build-module, build-module-helper): Use it.
	(build-shlib-objlist): New variable using build-module-helper-objlist.
	(build-shlib): Use that.
	* sysdeps/mach/hurd/Makefile ($(link-rpcuserlibs)): Likewise.

1 files changed, 3 insertions, 5 deletions

diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index e8cd4dccb7..afeefc6b4c 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -151,11 +151,9 @@ endif
 $(link-rpcuserlibs): %-link.so: %_pic.a
 # These shared objects are just for the purpose of linking libc,
 # so they don't need abi-note.o linked into them.
-	$(build-module-helper) \
-		-o $@ -nostdlib -Wl,-soname=$(*F).so$($(*F).so-version) \
-		-Wl,--whole-archive \
-		$(filter-out $(map-file) $(+preinit) $(+postinit),$^) \
-		$(no-whole-archive) $(LDLIBS-$(@F:lib%.so=%).so)
+	$(build-shlib-helper) \
+		-nostdlib -o $@ \
+		$(build-shlib-objlist)
 
 # And get them into the libc.so ldscript.
 $(inst_libdir)/libc.so: $(rpcuserlibs)