OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Remove CONFIG_USE_FDPIC.

Browse Source 
We want to avoid code disabled by default, because it ends up less
tested. This patch removes all instances of #ifdef CONFIG_USE_FDPIC,
most of which can be safely kept. For the ones that should be
conditionally executed, we define elf_is_fdpic(). Without this patch,
defining CONFIG_USE_FDPIC would prevent QEMU from building precisely
because elf_is_fdpic is not defined.

Signed-off-by: Christophe Lyon <christophe.lyon@st.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20180430080404.7323-2-christophe.lyon@st.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Christophe Lyon 2018-04-30 10:03:41 +02:00 committed by Laurent Vivier
parent 59255887e6
commit a99856cd7f
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
linux-user/elfload.c
View File

@ -1681,7 +1681,12 @@ static void zero_bss(abi_ulong elf_bss, abi_ulong last_bss, int prot)
} }
} }
#ifdef CONFIG_USE_FDPIC /* Default implementation, always false. */
static int elf_is_fdpic(struct elfhdr *exec)
{
return 0;
}
static abi_ulong loader_build_fdpic_loadmap(struct image_info *info, abi_ulong sp) static abi_ulong loader_build_fdpic_loadmap(struct image_info *info, abi_ulong sp)
{ {
uint16_t n; uint16_t n;
@ -1706,7 +1711,6 @@ static abi_ulong loader_build_fdpic_loadmap(struct image_info *info, abi_ulong s
return sp; return sp;
} }
#endif
static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,
struct elfhdr *exec, struct elfhdr *exec,
@ -1725,7 +1729,6 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,
sp = p; sp = p;
#ifdef CONFIG_USE_FDPIC
/* Needs to be before we load the env/argc/... */ /* Needs to be before we load the env/argc/... */
if (elf_is_fdpic(exec)) { if (elf_is_fdpic(exec)) {
/* Need 4 byte alignment for these structs */ /* Need 4 byte alignment for these structs */
@ -1737,7 +1740,6 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,
sp = loader_build_fdpic_loadmap(interp_info, sp); sp = loader_build_fdpic_loadmap(interp_info, sp);
} }
} }
#endif
u_platform = 0; u_platform = 0;
k_platform = ELF_PLATFORM; k_platform = ELF_PLATFORM;
@ -2153,10 +2155,8 @@ static void load_elf_image(const char *image_name, int image_fd,
} }
bswap_phdr(phdr, ehdr->e_phnum); bswap_phdr(phdr, ehdr->e_phnum);
#ifdef CONFIG_USE_FDPIC
info->nsegs = 0; info->nsegs = 0;
info->pt_dynamic_addr = 0; info->pt_dynamic_addr = 0;
#endif
mmap_lock(); mmap_lock();
@ -2173,9 +2173,7 @@ static void load_elf_image(const char *image_name, int image_fd,
if (a > hiaddr) { if (a > hiaddr) {
hiaddr = a; hiaddr = a;
} }
#ifdef CONFIG_USE_FDPIC
++info->nsegs; ++info->nsegs;
#endif
} }
} }
@ -2200,8 +2198,7 @@ static void load_elf_image(const char *image_name, int image_fd,
} }
load_bias = load_addr - loaddr; load_bias = load_addr - loaddr;
#ifdef CONFIG_USE_FDPIC if (elf_is_fdpic(ehdr)) {
{
struct elf32_fdpic_loadseg *loadsegs = info->loadsegs = struct elf32_fdpic_loadseg *loadsegs = info->loadsegs =
g_malloc(sizeof(*loadsegs) * info->nsegs); g_malloc(sizeof(*loadsegs) * info->nsegs);
@ -2219,7 +2216,6 @@ static void load_elf_image(const char *image_name, int image_fd,
} }
} }
} }
#endif
info->load_bias = load_bias; info->load_bias = load_bias;
info->load_addr = load_addr; info->load_addr = load_addr;

4
linux-user/qemu.h
View File

@ -51,13 +51,13 @@ struct image_info {
abi_ulong file_string; abi_ulong file_string;
uint32_t elf_flags; uint32_t elf_flags;
int personality; int personality;
#ifdef CONFIG_USE_FDPIC
/* The fields below are used in FDPIC mode. */
abi_ulong loadmap_addr; abi_ulong loadmap_addr;
uint16_t nsegs; uint16_t nsegs;
void *loadsegs; void *loadsegs;
abi_ulong pt_dynamic_addr; abi_ulong pt_dynamic_addr;
struct image_info *other_info; struct image_info *other_info;
#endif
}; };
#ifdef TARGET_I386 #ifdef TARGET_I386