about summary refs log tree commit diff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-06-12 09:00:13 +0000
committerRoland McGrath <roland@gnu.org>1995-06-12 09:00:13 +0000
commitf2b0f935d7c8de544408181350c13d8a4db690ca (patch)
tree658304e442dad6ff4c31f1d1d6a3293b7509f20d /Makerules
parent5bf62f2d3a8af353fac661b224fc1604d4de51ea (diff)
downloadglibc-f2b0f935d7c8de544408181350c13d8a4db690ca.tar.gz
glibc-f2b0f935d7c8de544408181350c13d8a4db690ca.tar.xz
glibc-f2b0f935d7c8de544408181350c13d8a4db690ca.zip
* elf/dl-load.c (_dl_map_object): Add MAP_INHERIT flag in mmap
 	from zero fill.

	* elf/dl-lookup.c (_dl_lookup_symbol): Take new flag arg NOSELF;
 	if nonzero, don't let *REF satisfy the reference itself.
	* elf/link.h (_dl_lookup_symbol): Add new arg NOSELF in decl.
	* sysdeps/i386/dl-runtime.c (_dl_runtime_resolve): Pass new arg to
 	_dl_lookup_symbol.
	* elf/do-rel.h (elf_dynamic_do_rel): Pass new second arg of
 	R->r_offset to RESOLVE callback.
	* elf/dl-reloc.c (_dl_relocate_object: resolve): Don't let *REF
 	satisfy the reference itself if its value equals the reloc's
 	offset.

	* elf/rtld.c (dl_main): Write a newline in fatal msg.

	* Makerules (lib%.so: lib%_pic.a): Pass $(LDFLAGS.so).
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makerules b/Makerules
index 593a81c9d7..87e71a832d 100644
--- a/Makerules
+++ b/Makerules
@@ -355,10 +355,10 @@ ifeq (yes,$(build-shared))
 # $(LDLIBS-%.so) may contain -l switches to generate run-time dependencies
 # on other shared objects.
 lib%.so: lib%_pic.a
-	$(LINK.o) -shared -o $@ -Wl,--whole-archive $< \
-		  $(LDFLAGS-$(notdir $*).so) \
+	$(LINK.o) -shared -o $@ \
+		  $(LDFLAGS.so) $(LDFLAGS-$(notdir $*).so) \
 		  -L$(firstword $(objdir) .)  -L$(common-objpfx:%/=%) \
-		  $(LDLIBS-$(notdir $*).so)
+		  $(LDLIBS-$(notdir $*).so) -Wl,--whole-archive $< \
 
 # Don't try to use -lc when making libc.so itself.
 # Also omits crti.o and crtn.o, which we do not want