diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 13 | ||||
| -rw-r--r-- | elf/rtld.map | 12 |
2 files changed, 3 insertions, 22 deletions
diff --git a/elf/Makefile b/elf/Makefile index eb3ff48caf..85dba53f99 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -35,7 +35,6 @@ elide-routines.os = $(dl-routines) dl-support enbl-secure # ld.so uses those routines, plus some special stuff for being the program # interpreter and operating independent of libc. rtld-routines := rtld $(dl-routines) dl-sysdep dl-minimal -rtld-map := rtld.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 @@ -61,15 +60,9 @@ generated += ldd endif ifeq (yes,$(has-ldconfig)) +others-static += ldconfig others += ldconfig install-rootsbin = ldconfig - -$(objpfx)ldconfig: $(objpfx)ldconfig.o - $(CC) -nostdlib -nostartfiles -o $@ $(sysdep-LDFLAGS) -static \ - $(addprefix $(csu-objpfx),start.o) $(+preinit) \ - $(filter-out $(addprefix $(csu-objpfx),start.o) $(+preinit) \ - $(link-extra-libs) $(common-objpfx)libc% $(+postinit),$^) \ - $(link-extra-libs) $(common-objpfx)libc.a $(gnulib) $(+postinit) endif include ../Rules @@ -114,7 +107,7 @@ define rtld-link $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ -Wl,-rpath=$(default-rpath) $(LDFLAGS-rtld) \ $(filter-out $(objpfx)rtld-ldscript,$^) \ - -Wl,--version-script=$(rtld-map) + -Wl,--version-script=$(libc-map) endef else $(objpfx)ld.so: $(objpfx)librtld.os @@ -123,7 +116,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os define rtld-link $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ -Wl,-rpath=$(default-rpath) $^ \ - -Wl,--version-script=$(rtld-map) + -Wl,--version-script=$(libc-map) endef endif diff --git a/elf/rtld.map b/elf/rtld.map deleted file mode 100644 index 8daf2aa97a..0000000000 --- a/elf/rtld.map +++ /dev/null @@ -1,12 +0,0 @@ -GLIBC_2.0 { - global: - # Not right, but I'll figure it out. - *; - -# local: -# *; -}; - -GLIBC_2.1 { - -} GLIBC_2.0; |