diff options
Diffstat (limited to 'libc/elf')
| -rw-r--r-- | libc/elf/Makefile | 4 | ||||
| -rw-r--r-- | libc/elf/do-rel.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libc/elf/Makefile b/libc/elf/Makefile index 0b7afbf38..3b58649de 100644 --- a/libc/elf/Makefile +++ b/libc/elf/Makefile @@ -59,9 +59,9 @@ before-compile = $(objpfx)trusted-dirs.h generated := trusted-dirs.h trusted-dirs.st for-renamed/renamed.so generated-dirs := for-renamed -# eglibc: ifeq ($(versioning),yes) +ifeq ($(versioning),yes) ld-map = $(common-objpfx)ld.map -# eglibc: endif +endif ifeq (yes,$(build-shared)) extra-objs = $(all-rtld-routines:%=%.os) soinit.os sofini.os interp.os diff --git a/libc/elf/do-rel.h b/libc/elf/do-rel.h index 408ea7a8a..52cc54839 100644 --- a/libc/elf/do-rel.h +++ b/libc/elf/do-rel.h @@ -111,7 +111,7 @@ elf_dynamic_do_Rel (struct link_map *map, for (; relative < r; ++relative) DO_ELF_MACHINE_REL_RELATIVE (map, l_addr, relative); -#if defined RTLD_BOOTSTRAP && defined DO_VERSIONING +#ifdef RTLD_BOOTSTRAP /* The dynamic linker always uses versioning. */ assert (map->l_info[VERSYMIDX (DT_VERSYM)] != NULL); #else @@ -154,7 +154,7 @@ elf_dynamic_do_Rel (struct link_map *map, } #endif } -#if !defined RTLD_BOOTSTRAP || !defined DO_VERSIONING +#ifndef RTLD_BOOTSTRAP else { for (; r < end; ++r) |