about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--elf/dl-support.c3
-rw-r--r--sysdeps/i386/dl-machine.h9
3 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 81d6c2dc8e..bb6172fdb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,14 @@
+2000-03-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/i386/dl-machine.h (RTLD_START): Optimize for i686.
+	* elf/dl-support.c: Define _dl_starting_up.
+
 2000-03-30  Ulrich Drepper  <drepper@redhat.com>
 
-	* elf/dl-init.c (_dl_init): Clear _dl_starting_up at end of
-	with size of dynamic sectionfunction.
+	* elf/dl-init.c (_dl_init): Clear _dl_starting_up at end of function.
 	* sysdeps/i386/dl-machine.h: Remove code to clear _dl_starting_up.
 
-	* misc/sys/cdefs.h: Don't allow gcc in traditional mode to be
-	with size of dynamic sectionused.
+	* misc/sys/cdefs.h: Don't allow gcc in traditional mode to be used.
 
 	* elf/Makefile (dl-routines): Remove preinit.
 	* elf/Versions: Remove _dl_preinit.
@@ -14,7 +17,7 @@
 	* sysdeps/i386/dl-machine.h (RTLD_START): Remove call to _dl_preinit.
 
 	* sysdeps/generic/bits/shm.h (struct shmid_ds): Correct names of
-	with size of dynamic sectionelements.
+	elements.
 
 2000-03-29  Geoff Clare  <gwc@unisoft.com>
 
diff --git a/elf/dl-support.c b/elf/dl-support.c
index 581c79c012..8201ced490 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -78,6 +78,9 @@ struct r_scope_elem *_dl_global_scope[2] = { &_dl_initial_searchlist, NULL };
    to be the global scope.  */
 struct r_scope_elem *_dl_main_searchlist = &_dl_initial_searchlist;
 
+/* Nonzero during startup.  */
+int _dl_starting_up = 1;
+
 
 static void non_dynamic_init (void) __attribute__ ((unused));
 
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 74f2eb3448..507a69d338 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -196,6 +196,10 @@ _dl_runtime_profile:
 
 #define RTLD_START asm ("\
 .text\n\
+	.align 16\n\
+0:	movl (%esp), %ebx\n\
+	ret\n\
+	.align 16\n\
 .globl _start\n\
 .globl _dl_start_user\n\
 _start:\n\
@@ -206,9 +210,8 @@ _dl_start_user:\n\
 	# Save the user entry point address in %edi.\n\
 	movl %eax, %edi\n\
 	# Point %ebx at the GOT.
-	call 0f\n\
-0:	popl %ebx\n\
-	addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx\n\
+	call 0b\n\
+	addl $_GLOBAL_OFFSET_TABLE_, %ebx\n\
 	# Store the highest stack address\n\
 	movl __libc_stack_end@GOT(%ebx), %eax\n\
 	movl %esp, (%eax)\n\