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 /Makerules | |
| parent | 7cbeabac0fb28e24c99aaa5085e613ea543a2346 (diff) | |
| download | glibc-ac63a0783cdee8454c84fc45f37330d98b6039e7.tar.gz glibc-ac63a0783cdee8454c84fc45f37330d98b6039e7.tar.xz glibc-ac63a0783cdee8454c84fc45f37330d98b6039e7.zip | |
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>.
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Makerules b/Makerules index c79915f07b..ad9d74f660 100644 --- a/Makerules +++ b/Makerules @@ -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).)) |