diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2015-06-05 22:20:13 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2015-06-10 10:14:45 +0000 |
| commit | ac63a0783cdee8454c84fc45f37330d98b6039e7 (patch) | |
| tree | d32900cb01c19ddb23b8b018f890677ab23081d1 | |
| parent | 7cbeabac0fb28e24c99aaa5085e613ea543a2346 (diff) | |
| download | glibc-ac63a0783cdee8454c84fc45f37330d98b6039e7.tar.gz | |
Prepare for restoration of .interp section in libpthread.so
Make runtime-linker.h available outside $(elf-objpfx) by moving
the file to $(common-objpfx) and the rules for it to Makerules.
Tested for x86_64 and x86 (testsuite, and that no compiled code
changed by the patch).
* Makeconfig (+interp): Remove unused variable.
* elf/Makefile ($(objpfx)interp.os): Define for [$(build-shared) = yes]
only. Depend on $(common-objpfx)runtime-linker.h instead of
$(elf-objpfx)runtime-linker.h.
($(elf-objpfx)runtime-linker.h): Rename to
$(common-objpfx)runtime-linker.h and move ...
* Makerules [$(build-shared) = yes]: ... here.
* elf/interp.c: Include <runtime-linker.h> instead of
<elf/runtime-linker.h>.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makeconfig | 1 | ||||
| -rw-r--r-- | Makerules | 10 | ||||
| -rw-r--r-- | elf/Makefile | 12 | ||||
| -rw-r--r-- | elf/interp.c | 2 |
5 files changed, 26 insertions, 11 deletions
@@ -1,3 +1,15 @@ +2015-06-10 Dmitry V. Levin <ldv@altlinux.org> + + * Makeconfig (+interp): Remove unused variable. + * elf/Makefile ($(objpfx)interp.os): Define for [$(build-shared) = yes] + only. Depend on $(common-objpfx)runtime-linker.h instead of + $(elf-objpfx)runtime-linker.h. + ($(elf-objpfx)runtime-linker.h): Rename to + $(common-objpfx)runtime-linker.h and move ... + * Makerules [$(build-shared) = yes]: ... here. + * elf/interp.c: Include <runtime-linker.h> instead of + <elf/runtime-linker.h>. + 2015-06-09 Adhemerval Zanella <adhemerval.zanella@linaro.org> * sysdeps/unix/sysv/linux/i386/gettimeofday.c diff --git a/Makeconfig b/Makeconfig index d32a0fdc65..0f4b5497c1 100644 --- a/Makeconfig +++ b/Makeconfig @@ -596,7 +596,6 @@ endif # Variants of the two previous definitions for statically linking programs. +prectorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginT.o` +postctorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o` -+interp = $(addprefix $(elf-objpfx),interp.os) csu-objpfx = $(common-objpfx)csu/ elf-objpfx = $(common-objpfx)elf/ @@ -123,6 +123,16 @@ $(common-objpfx)libc-abis.stamp: $(..)scripts/gen-libc-abis \ common-generated += $(common-objpfx)libc-abis.h endif # avoid-generated +ifeq (yes,$(build-shared)) +$(common-objpfx)runtime-linker.h: $(common-objpfx)runtime-linker.stamp; @: +$(common-objpfx)runtime-linker.stamp: $(common-objpfx)config.make + $(make-target-directory) + echo '#define RUNTIME_LINKER "$(rtlddir)/$(rtld-installed-name)"' \ + > ${@:stamp=T} + $(move-if-change) ${@:stamp=T} ${@:stamp=h} + touch $@ +endif + # Make sure the subdirectory for object files gets created. ifdef objpfx ifeq (,$(wildcard $(objpfx).)) diff --git a/elf/Makefile b/elf/Makefile index f2a115a8c9..871cb4fd65 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -365,16 +365,10 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map) | $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }' mv -f $@.new $@ +ifeq (yes,$(build-shared)) # interp.c exists just to get the runtime linker path into libc.so. -$(objpfx)interp.os: $(elf-objpfx)runtime-linker.h - -$(elf-objpfx)runtime-linker.h: $(elf-objpfx)runtime-linker.st; @: -$(elf-objpfx)runtime-linker.st: $(common-objpfx)config.make - $(make-target-directory) - echo '#define RUNTIME_LINKER "$(rtlddir)/$(rtld-installed-name)"' \ - > ${@:st=T} - $(move-if-change) ${@:st=T} ${@:st=h} - touch $@ +$(objpfx)interp.os: $(common-objpfx)runtime-linker.h +endif ifneq (ld.so,$(rtld-installed-name)) # Make sure ld.so.1 exists in the build directory so we can link diff --git a/elf/interp.c b/elf/interp.c index 5d4246a439..422ea95e9d 100644 --- a/elf/interp.c +++ b/elf/interp.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <elf/runtime-linker.h> +#include <runtime-linker.h> const char __invoke_dynamic_linker__[] __attribute__ ((section (".interp"))) = RUNTIME_LINKER; |