summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/pthread_spin_init.c1
-rw-r--r--sysdeps/generic/libc-start.c4
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a41415f17..9b5d10fde1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-17  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/generic/libc-start.c [!SHARED &&
+	!LIBC_START_MAIN_AUXVEC_ARG]: Compute beginning of auxvec correctly.
+
 2003-03-17  Roland McGrath  <roland@redhat.com>
 
 	* include/ctype.h: Revert last change.
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/pthread_spin_init.c b/nptl/sysdeps/unix/sysv/linux/i386/pthread_spin_init.c
new file mode 100644
index 0000000000..80c0b52165
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/i386/pthread_spin_init.c
@@ -0,0 +1 @@
+#include <nptl/sysdeps/i386/pthread_spin_init.c>
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index c6178d79af..351205d636 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -115,8 +115,8 @@ LIBC_START_MAIN (int (*main) (int, char **, char **
   ElfW(auxv_t) *__unbounded auxvec;
   {
     char *__unbounded *__unbounded evp = ubp_ev;
-    while (*evp != NULL)
-      ++evp;
+    while (*evp++ != NULL)
+      ;
     auxvec = (ElfW(auxv_t) *__unbounded) evp;
   }
 #  endif