summaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-05-08 20:42:23 +0000
committerUlrich Drepper <drepper@redhat.com>1998-05-08 20:42:23 +0000
commitc7562c74ed1b18fda99bfd5f6c4b61a449bcb35f (patch)
treee41cbd118cf034f46d55af209737acb87f0eaf2c /elf
parentb9a60a8f14b13145029d370fdeffd34b37c69c6a (diff)
Update.
* intl/locale.alias: Change italian to it_IT.ISO-8859-1. Reported by Ottavio G. Rizzo <otto@mast.queensu.ca>. 1998-05-08 19:24 Zack Weinberg <zack@rabi.phys.columbia.edu> * Makefile (+subdir-inits): Delete variable. (+init_subdirs): Likewise. (aux): Likewise. (before-compile): Likewise. (libc-init): Delete stanza. (version-info.h): Delete rule and associated variable. (distribute): Don't distribute moved files. * Makerules (interp-obj): It lives in elf now. Only use it if $(elf) is set. Delete rule to build it. * csu/Makefile: Build set-init.o and/or munch-init.o. Build version.o and version-info.h. Minor cleanups. (routines): Add libc-init, sysdep, version. (generated): Add version-info.h. * elf/Makefile: Build interp.os. * interp.c: Moved to elf. * set-init.c: Moved to csu. * munch-init.c: Likewise. * munch.awk: Likewise. * version.c: Likewise. * Makeconfig: Add emacs mode marker. * Makerules: Likewise. * Rules: Likewise, and also unconfuse syntax highlighting with a fake comment. 1998-05-08 Ulrich Drepper <drepper@cygnus.com>
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile7
-rw-r--r--elf/interp.c21
2 files changed, 26 insertions, 2 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 9ce3ac51e2..2c164158b3 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -39,7 +39,7 @@ ld-map = $(libc-map)
distribute = $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
dl-hash.h soinit.c sofini.c ldd.sh.in ldd.bash.in eval.c \
genrtldtbl.awk atomicity.h dl-procinfo.h ldsodefs.h \
- dl-librecon.h
+ dl-librecon.h interp.c
extra-libs = libdl
extra-libs-others = $(extra-libs)
@@ -54,7 +54,7 @@ all: # Make this the default target; it will be defined in Rules.
include ../Makeconfig
ifeq (yes,$(build-shared))
-extra-objs = $(rtld-routines:=.os) soinit.os sofini.os eval.os
+extra-objs = $(rtld-routines:=.os) soinit.os sofini.os eval.os interp.os
generated = librtld.os dl-allobjs.os ld.so trusted-dirs.h rtldtbl.h
install-others = $(inst_slibdir)/$(rtld-installed-name)
install-bin = ldd
@@ -124,6 +124,9 @@ endef
# The dl code in the static libc needs a default library path.
CFLAGS-dl-support.c = -D'DEFAULT_RPATH="$(default-rpath)"'
+# interp.c exists just to get this string into the libraries.
+CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"'
+
ifneq (ld.so,$(rtld-installed-name))
# Make sure ld.so.1 exists in the build directory so we can link
# against it.
diff --git a/elf/interp.c b/elf/interp.c
new file mode 100644
index 0000000000..540a303620
--- /dev/null
+++ b/elf/interp.c
@@ -0,0 +1,21 @@
+/* interp - add information about dynamic loader to shared library objects.
+ Copyright (C) 1996 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+const char __invoke_dynamic_linker__[] __attribute__ ((section (".interp")))
+ = RUNTIME_LINKER;