summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2005-03-14 22:09:14 +0000
committerEric Andersen <andersen@codepoet.org>2005-03-14 22:09:14 +0000
commit90fd5cb00fc8399392bf5ce69432c0ac5678606a (patch)
treec87277fbf3f9663d4eeffd48d96855022be927fd
parent3d41585c1c0045932624b07d150177c7c35e8602 (diff)
Fix up x86 so it compiles again.
-rw-r--r--ldso/ldso/i386/dl-sysdep.h4
-rw-r--r--ldso/ldso/ldso.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/ldso/ldso/i386/dl-sysdep.h b/ldso/ldso/i386/dl-sysdep.h
index b0edee369..ecc7b0b4c 100644
--- a/ldso/ldso/i386/dl-sysdep.h
+++ b/ldso/ldso/i386/dl-sysdep.h
@@ -59,11 +59,11 @@ elf_machine_load_address (void)
/* It doesn't matter what variable this is, the reference never makes
it to assembly. We need a dummy reference to some global variable
via the GOT to make sure the compiler initialized %ebx in time. */
- extern int _dl_argc;
+ extern int _dl_errno;
Elf32_Addr addr;
asm ("leal _dl_boot@GOTOFF(%%ebx), %0\n"
"subl _dl_boot@GOT(%%ebx), %0"
- : "=r" (addr) : "m" (_dl_argc) : "cc");
+ : "=r" (addr) : "m" (_dl_errno) : "cc");
return addr;
}
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index e6220a143..c2560a1a2 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -58,7 +58,6 @@ char *_dl_debug_bindings = 0;
int _dl_debug_file = 2;
#endif
-extern attribute_hidden void _dl_boot(void);
#include "dl-startup.c"
/* Forward function declarations */
static int _dl_suid_ok(void);