Fix up x86 so it compiles again.

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;
 }
 

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);