aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-03-24 23:00:36 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-03-24 23:00:36 +0000
commit644c433cb3759599aa1440b412964f8e49cc0b71 (patch)
tree6e68d21c28cbdbacb0f97041f656b58a7b3c668f
parentd691f66983c0b36689400e9e9137d72bd3be8e72 (diff)
ld.so load fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@47 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--README8
-rw-r--r--linux-user/elfload.c8
-rw-r--r--qemu-doc.texi11
3 files changed, 19 insertions, 8 deletions
diff --git a/README b/README
index 34061434a0..64fe7e937a 100644
--- a/README
+++ b/README
@@ -23,8 +23,12 @@ libraries installed on your PC. For example:
./qemu -L / /bin/ls
* On non x86 CPUs, you need first to download at least an x86 glibc
-(qemu-i386-glibc21.tar.gz on the qemu web page). Then you can launch
-the precompiled 'ls' x86 executable:
+(qemu-i386-glibc21.tar.gz on the qemu web page). Ensure that
+LD_LIBRARY_PATH is not set:
+
+ unset LD_LIBRARY_PATH
+
+Then you can launch the precompiled 'ls' x86 executable:
./qemu /usr/local/qemu-i386/bin/ls
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 817913df45..386991a495 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -360,9 +360,6 @@ static unsigned int * create_elf_tables(char *p, int argc, int envc,
put_user (tswapl(val), dlinfo++)
if (exec) { /* Put this here for an ELF program interpreter */
- struct elf_phdr * eppnt;
- eppnt = (struct elf_phdr *)((unsigned long)exec->e_phoff);
-
NEW_AUX_ENT (AT_PHDR, (unsigned int)(load_addr + exec->e_phoff));
NEW_AUX_ENT (AT_PHENT, (unsigned int)(sizeof (struct elf_phdr)));
NEW_AUX_ENT (AT_PHNUM, (unsigned int)(exec->e_phnum));
@@ -418,6 +415,9 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,
*/
load_addr = INTERP_LOADADDR;
+#ifdef BSWAP_NEEDED
+ bswap_ehdr(interp_elf_ex);
+#endif
/* First of all, some simple consistency checks */
if ((interp_elf_ex->e_type != ET_EXEC &&
interp_elf_ex->e_type != ET_DYN) ||
@@ -425,6 +425,7 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,
return ~0UL;
}
+
/* Now read in all of the header information */
if (sizeof(struct elf_phdr) * interp_elf_ex->e_phnum > X86_PAGE_SIZE)
@@ -452,7 +453,6 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,
(char *) elf_phdata,
sizeof(struct elf_phdr) * interp_elf_ex->e_phnum);
}
-
if (retval < 0) {
perror("load_elf_interp");
exit(-1);
diff --git a/qemu-doc.texi b/qemu-doc.texi
index fb9ed0ae90..8afdbe0b9d 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -92,8 +92,15 @@ qemu -L / /bin/ls
@item On non x86 CPUs, you need first to download at least an x86 glibc
-(@file{qemu-i386-glibc21.tar.gz} on the QEMU web page). Then you can
-launch the precompiled @file{ls} x86 executable:
+(@file{qemu-i386-glibc21.tar.gz} on the QEMU web page). Ensure that
+@code{LD_LIBRARY_PATH} is not set:
+
+@example
+unset LD_LIBRARY_PATH
+@end example
+
+Then you can launch the precompiled @file{ls} x86 executable:
+
@example
qemu /usr/local/qemu-i386/bin/ls
@end example