* sysdeps/ia64/dl-fptr.c (__ia64_make_fptr): Add const to MAP arg.

	* sysdeps/ia64/dl-machine.h: Update decl.

6 files changed, 22 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 943f7ba14e..cb72f138e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-03  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/ia64/dl-fptr.c (__ia64_make_fptr): Add const to MAP arg.
+	* sysdeps/ia64/dl-machine.h: Update decl.
+
 2003-03-03  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/clock_settime.c (HANDLE_REALTIME): Add missing
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index ba075bb943..d6ca84806c 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-03  Roland McGrath  <roland@redhat.com>
+
+	* forward.c: Fix typo in __pthread_attr_init_2_0 compat_symbol decl.
+
+	* sysdeps/pthread/pthread-functions.h (struct pthread_functions):
+	Argument to ptr___pthread_cleanup_upto is __jmp_buf, not jmp_buf.
+	* sysdeps/unix/sysv/linux/jmp-unwind.c: Likewise.
+
 2003-03-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/pthread/timer_create.c (timer_create): Return correct
diff --git a/nptl/sysdeps/pthread/pthread-functions.h b/nptl/sysdeps/pthread/pthread-functions.h
index f6922a0d6c..9f38e34053 100644
--- a/nptl/sysdeps/pthread/pthread-functions.h
+++ b/nptl/sysdeps/pthread/pthread-functions.h
@@ -71,7 +71,7 @@ struct pthread_functions
   pthread_t (*ptr_pthread_self) (void);
   int (*ptr_pthread_setcancelstate) (int, int *);
   int (*ptr_pthread_setcanceltype) (int, int *);
-  void (*ptr___pthread_cleanup_upto) (jmp_buf, char *);
+  void (*ptr___pthread_cleanup_upto) (__jmp_buf, char *);
   int (*ptr___pthread_once) (pthread_once_t *, void (*) (void));
   int (*ptr___pthread_rwlock_rdlock) (pthread_rwlock_t *);
   int (*ptr___pthread_rwlock_wrlock) (pthread_rwlock_t *);
diff --git a/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c b/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c
index f0a290ae4b..d6fbcc39eb 100644
--- a/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c
+++ b/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c
@@ -21,7 +21,7 @@
 #include <stddef.h>
 #include <pthread-functions.h>
 
-extern void __pthread_cleanup_upto (jmp_buf env, char *targetframe);
+extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
 #pragma weak __pthread_cleanup_upto
 
 
@@ -35,5 +35,5 @@ _longjmp_unwind (jmp_buf env, int val)
 #endif
 
   if (fptr != NULL)
-    fptr (env, __builtin_frame_address (0));
+    fptr (env->__jmpbuf, __builtin_frame_address (0));
 }
diff --git a/sysdeps/ia64/dl-fptr.c b/sysdeps/ia64/dl-fptr.c
index 929d1959d2..3a4d8247a8 100644
--- a/sysdeps/ia64/dl-fptr.c
+++ b/sysdeps/ia64/dl-fptr.c
@@ -1,5 +1,5 @@
 /* Manage function descriptors.  IA-64 version.
-   Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999,2000,2001,2002,2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -191,7 +191,8 @@ make_fptr_table (struct link_map *map)
 }
 
 Elf64_Addr
-__ia64_make_fptr (struct link_map *map, const Elf64_Sym *sym, Elf64_Addr ip)
+__ia64_make_fptr (const struct link_map *map,
+		  const Elf64_Sym *sym, Elf64_Addr ip)
 {
   Elf64_Addr *ftab = map->l_mach.fptr_table;
   const Elf64_Sym *symtab;
diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h
index f5eeef67db..6268fb3e53 100644
--- a/sysdeps/ia64/dl-machine.h
+++ b/sysdeps/ia64/dl-machine.h
@@ -52,8 +52,8 @@ struct ia64_fdesc_table
     struct ia64_fdesc fdesc[0];
   };
 
-extern Elf64_Addr __ia64_make_fptr (struct link_map *, const Elf64_Sym *,
-				    Elf64_Addr);
+extern Elf64_Addr __ia64_make_fptr (const struct link_map *,
+				    const Elf64_Sym *, Elf64_Addr);
 
 static inline void
 __ia64_init_bootstrap_fdesc_table (struct link_map *map)
@@ -583,7 +583,7 @@ elf_machine_rela (struct link_map *map,
 # ifdef RTLD_BOOTSTRAP
 	    /* During startup the dynamic linker is always index 1.  */
 	    value = 1;
-# else	      
+# else
 	    /* Get the information from the link map returned by the
 	       resolv function.  */
 	    value = sym_map->l_tls_modid;