diff options
| author | Roland McGrath <roland@gnu.org> | 2003-10-22 07:10:00 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-10-22 07:10:00 +0000 |
| commit | 27d640befba8c7b91d5ba9e1152dbf039a18133b (patch) | |
| tree | 6219ece9d560763ea32d6111ae73ca0465766909 /elf/Makefile | |
| parent | 026395a2a6cfeeb365d2a2993a1aebd6f58b1f95 (diff) | |
| download | glibc-27d640befba8c7b91d5ba9e1152dbf039a18133b.zip glibc-27d640befba8c7b91d5ba9e1152dbf039a18133b.tar.gz glibc-27d640befba8c7b91d5ba9e1152dbf039a18133b.tar.bz2 | |
* sysdeps/unix/sysv/linux/hppa/sysdep.h: Fix merge error.
2003-10-15 Roland McGrath <roland@redhat.com>
* elf/dl-iteratephdr.c [! SHARED] (dl_iterate_phdr): New function.
Fake an entry for the main executable and then call __dl_iterate_phdr.
* elf/Makefile (routines): Remove dl-iteratephdr-static.
(elide-routines.os): Likewise.
(CFLAGS-dl-iterate-phdr-static.c): Variable removed.
* sysdeps/generic/dl-iteratephdr-static.c: File removed.
* sysdeps/unix/sysv/linux/ia64/dl-iteratephdr-static.c: File removed.
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/elf/Makefile b/elf/Makefile index 2e6b6cb..ead590b 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -22,7 +22,7 @@ subdir := elf headers = elf.h bits/elfclass.h link.h routines = $(dl-routines) dl-open dl-close dl-support dl-iteratephdr \ - dl-iteratephdr-static dl-addr enbl-secure dl-profstub \ + dl-addr enbl-secure dl-profstub \ dl-origin dl-libc dl-sym dl-tsd # The core dynamic linking functions are in libc for the static and @@ -33,8 +33,7 @@ dl-routines = $(addprefix dl-,load cache lookup object reloc deps \ execstack) all-dl-routines = $(dl-routines) $(sysdep-dl-routines) # But they are absent from the shared libc, because that code is in ld.so. -elide-routines.os = $(all-dl-routines) dl-support enbl-secure \ - dl-iteratephdr-static dl-origin +elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin # ld.so uses those routines, plus some special stuff for being the program # interpreter and operating independent of libc. @@ -87,7 +86,6 @@ distribute := rtld-Rules \ CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-dl-iterate-phdr.c = $(uses-callbacks) -CFLAGS-dl-iterate-phdr-static.c = $(uses-callbacks) include ../Makeconfig |