2000-04-14 Andreas Jaeger <aj@suse.de>

	* weaks.c: Fix typo.

2000-04-14  Andreas Jaeger  <aj@suse.de>

	* sysdeps/generic/madvise.c: Fix typos.

	* sysdeps/unix/sysv/linux/mips/clone.S (error): Use __PIC__.

	* sysdeps/mips/bits/setjmp.h: Remove K&R compatibility.

	* sysdeps/mips/setjmp_aux.c (__sigsetjmp_aux): Silence gcc
	warnings.
2000-04-14  Andreas Jaeger  <aj@suse.de>

	* weaks.c: Fix typo.

6 files changed, 16 insertions, 12 deletions

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index aabde7b4ce..c02864a4ab 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-14  Andreas Jaeger  <aj@suse.de>
+
+	* weaks.c: Fix typo.
+
 2000-04-13  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/getcpuclockid.c
diff --git a/linuxthreads/weaks.c b/linuxthreads/weaks.c
index f6705f1108..077158e2f0 100644
--- a/linuxthreads/weaks.c
+++ b/linuxthreads/weaks.c
@@ -32,7 +32,7 @@ versioned_symbol (libpthread, __libc_pthread_attr_init_2_1, pthread_attr_init,
 		  GLIBC_2_1);
 #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
 weak_alias (__pthread_return_0, __libc_pthread_attr_init_2_0)
-compat_symbol (libpthread, __libc_pthread_attr_init_2_, pthread_attr_init,
+compat_symbol (libpthread, __libc_pthread_attr_init_2_0, pthread_attr_init,
 	       GLIBC_2_0);
 #endif
 weak_alias (__pthread_return_0, pthread_attr_destroy)
diff --git a/sysdeps/generic/madvise.c b/sysdeps/generic/madvise.c
index d7379b15cb..22d4299a80 100644
--- a/sysdeps/generic/madvise.c
+++ b/sysdeps/generic/madvise.c
@@ -29,6 +29,6 @@ posix_madvise (__ptr_t addr, size_t len, int advice)
   __set_errno (ENOSYS);
   return -1;
 }
-weak_alias (posix_madvice, madvice)
+weak_alias (posix_madvise, madvise)
 stub_warning (madvise)
 #include <stub-tag.h>
diff --git a/sysdeps/mips/bits/setjmp.h b/sysdeps/mips/bits/setjmp.h
index ff3d75f821..908b6d5935 100644
--- a/sysdeps/mips/bits/setjmp.h
+++ b/sysdeps/mips/bits/setjmp.h
@@ -1,5 +1,5 @@
 /* Define the machine-dependent type `jmp_buf'.  MIPS version.
-   Copyright (C) 1992, 1993, 1995, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1992,93,95,97,2000 Free Software Foundation, Inc.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -23,19 +23,19 @@
 typedef struct
   {
     /* Program counter.  */
-    __ptr_t __pc;
+    void * __pc;
 
     /* Stack pointer.  */
-    __ptr_t __sp;
+    void * __sp;
 
     /* Callee-saved registers s0 through s7.  */
     int __regs[8];
 
     /* The frame pointer.  */
-    __ptr_t __fp;
+    void * __fp;
 
     /* The global pointer.  */
-    __ptr_t __gp;
+    void * __gp;
 
     /* Floating point status register.  */
     int __fpc_csr;
@@ -53,4 +53,4 @@ typedef struct
 /* Test if longjmp to JMPBUF would unwind the frame
    containing a local variable at ADDRESS.  */
 #define _JMPBUF_UNWINDS(jmpbuf, address) \
-  ((__ptr_t) (address) < (jmpbuf)[0].__sp)
+  ((void *) (address) < (jmpbuf)[0].__sp)
diff --git a/sysdeps/mips/setjmp_aux.c b/sysdeps/mips/setjmp_aux.c
index d06732efc2..e7b83c4d3c 100644
--- a/sysdeps/mips/setjmp_aux.c
+++ b/sysdeps/mips/setjmp_aux.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
@@ -39,10 +39,10 @@ __sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp)
   asm volatile ("sw $31, %0" : : "m" (env[0].__jmpbuf[0].__pc));
 
   /* .. and the stack pointer;  */
-  env[0].__jmpbuf[0].__sp = sp;
+  env[0].__jmpbuf[0].__sp = (void *) sp;
 
   /* .. and the FP; it'll be in s8. */
-  env[0].__jmpbuf[0].__fp = fp;
+  env[0].__jmpbuf[0].__fp = (void *) fp;
 
   /* .. and the GP; */
   asm volatile ("sw $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp));
diff --git a/sysdeps/unix/sysv/linux/mips/clone.S b/sysdeps/unix/sysv/linux/mips/clone.S
index 0398ba348e..cee391305c 100644
--- a/sysdeps/unix/sysv/linux/mips/clone.S
+++ b/sysdeps/unix/sysv/linux/mips/clone.S
@@ -72,7 +72,7 @@ NESTED(__clone,4*SZREG,sp)
 	/* Something bad happened -- no child created */
 error:
 	addiu		sp,32
-#ifdef PIC
+#ifdef __PIC__
 	la		t9,__syscall_error
 	jr		t9
 #else