summary refs log tree commit diff
path: root/Makerules
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-12-04 01:41:39 +0000
committerUlrich Drepper <drepper@redhat.com>1996-12-04 01:41:39 +0000
commit4770745624b7f7f25623f1f10d46a4c4d6aec25c (patch)
tree0b278b62f5486313ca69360800755575487fb0f8 /Makerules
parentd88554f033adab5d22b9860fc36bc3cb37f39b02 (diff)
downloadglibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.tar.gz
glibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.tar.xz
glibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.zip
update from main archive 961203
Tue Dec  3 08:38:15 1996  Richard Henderson  <rth@tamu.edu>

	* sysdeps/unix/alpha/sysdep.S: Remove definition of __errno_location.
	Reformat copyright.

	* elf/rtld.c (_dl_start): Don't dereference the value returned by
	elf_machine_got to get _DYNAMIC, instead call new function
	elf_machine_dynamic.
	* sysdeps/alpha/dl-machine.h: Permute elf_machine_got to
	elf_machine_dynamic.  Reformat copyright.
	* sysdeps/i386/dl-machine.h: Likewise.
	* sysdeps/m68k/dl-machine.h: Likewise.
	* sysdeps/mips/dl-machine.h: Likewise.
	* sysdeps/sparc/dl-machine.h: Likewise.
	* sysdeps/stub/dl-machine.h: Likewise.

Tue Oct 15 23:46:00 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* MakeTAGS (sysdep_dirs): Include add-on sysdep directories.

Tue Dec  3 02:06:18 1996  Ulrich Drepper  <drepper@cygnus.com>

	* Makerules ($(libdir)/libc.so): Make first line of generated
	link script contain `/* GNU ld script'.  This will be used in
	ldconfig to check for linker scripts.
	* sysdeps/mach/hurd/libc-ldscript: Likewise.
	* sysdeps/mach/hurd/libc_p-ldscript: Likewise.

	* stdlib/getsubopt.c: Update copyright.  Correct typo in comment.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makerules b/Makerules
index 19ec2410d8..1cb6855ffa 100644
--- a/Makerules
+++ b/Makerules
@@ -347,7 +347,6 @@ LDFLAGS-c.so = -nostdlib -nostartfiles
 # Give libc.so an entry point and make it directly runnable itself.
 LDFLAGS-c.so += -e __libc_main
 # Use our own special initializer and finalizer files for libc.so.
-elfobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)elf)
 $(common-objpfx)libc.so: $(elfobjdir)/soinit.so \
 			 $(common-objpfx)libc_pic.a \
 			 $(elfobjdir)/sofini.so $(elfobjdir)/ld.so
@@ -638,7 +637,8 @@ install: $(libdir)/libc.so
 $(libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \
 		   $(elfobjdir)/$(rtld-installed-name) \
 		   $(libdir)/lib$(libc-name).a
-	(echo '/* Use the shared library, but some functions are only in';\
+	(echo '/* GNU ld script';\
+	 echo '   Use the shared library, but some functions are only in';\
 	 echo '   the static library, so try that secondarily.'; \
 	 echo '   The dynamic linker defines some functions used by $(<F),';\
 	 echo '	  but ld uses definitions from libc.a before examining the';\