From 958528b013e8cef95565105d5bd06f36826448b0 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 3 Mar 2003 09:45:09 +0000 Subject: [PATCH] 2003-03-03 Roland McGrath * sysdeps/ia64/dl-fptr.c (__ia64_make_fptr): Revert last change. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/dl-symaddr.c (_dl_symbol_address): Remove const from argument type. * sysdeps/ia64/dl-lookupcfg.h: Update decl. --- sysdeps/ia64/dl-fptr.c | 3 +-- sysdeps/ia64/dl-lookupcfg.h | 5 ++--- sysdeps/ia64/dl-machine.h | 4 ++-- sysdeps/ia64/dl-symaddr.c | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sysdeps/ia64/dl-fptr.c b/sysdeps/ia64/dl-fptr.c index 3a4d8247a8..3c362b0f87 100644 --- a/sysdeps/ia64/dl-fptr.c +++ b/sysdeps/ia64/dl-fptr.c @@ -191,8 +191,7 @@ make_fptr_table (struct link_map *map) } Elf64_Addr -__ia64_make_fptr (const struct link_map *map, - const Elf64_Sym *sym, Elf64_Addr ip) +__ia64_make_fptr (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-lookupcfg.h b/sysdeps/ia64/dl-lookupcfg.h index 0beb7dda59..2b15420cab 100644 --- a/sysdeps/ia64/dl-lookupcfg.h +++ b/sysdeps/ia64/dl-lookupcfg.h @@ -1,5 +1,5 @@ /* Configuration of lookup functions. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 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 @@ -26,8 +26,7 @@ /* Forward declaration. */ struct link_map; -extern void *_dl_symbol_address (const struct link_map *map, - const Elf64_Sym *ref); +extern void *_dl_symbol_address (struct link_map *map, const Elf64_Sym *ref); #define DL_SYMBOL_ADDRESS(map, ref) _dl_symbol_address(map, ref) diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h index 6268fb3e53..be09ae81e6 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 (const struct link_map *, - const Elf64_Sym *, Elf64_Addr); +extern Elf64_Addr __ia64_make_fptr (struct link_map *, const Elf64_Sym *, + Elf64_Addr); static inline void __ia64_init_bootstrap_fdesc_table (struct link_map *map) diff --git a/sysdeps/ia64/dl-symaddr.c b/sysdeps/ia64/dl-symaddr.c index 52c5a12e14..c1d6f7295e 100644 --- a/sysdeps/ia64/dl-symaddr.c +++ b/sysdeps/ia64/dl-symaddr.c @@ -1,5 +1,5 @@ /* Get the symbol address. IA-64 version. - Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 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 @@ -21,7 +21,7 @@ #include void * -_dl_symbol_address (const struct link_map *map, const Elf64_Sym *ref) +_dl_symbol_address (struct link_map *map, const Elf64_Sym *ref) { Elf64_Addr value = (map ? map->l_addr : 0) + ref->st_value;