From ca6c73895da003ccea1b7e8ef2b32c98746812aa Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 27 Oct 2001 00:23:28 +0000 Subject: [PATCH] Update. 2001-10-26 Ulrich Drepper * string/strxfrm.c [USE_IN_EXTENDED_LOCALE_MODEL]: Correctly get nrules value. 2001-10-24 H.J. Lu * sysdeps/generic/bits/dlfcn.h (DL_CALL_FCT): Cast to void *. Use __BEGIN_DECLS/__END_DECLS around prototypes. * sysdeps/mips/bits/dlfcn.h (DL_CALL_FCT): Likewise. 2001-10-21 Jim Meyering * malloc/obstack.c (_): Honor the setting of ENABLE_NLS. Otherwise, this code would end up calling gettext even in packages built with --disable-nls. * posix/getopt.c (_): Likewise. * posix/regex.c (_): Likewise. 2001-10-26 Ulrich Drepper * resolv/gethnamaddr.c (gethostbyaddr): Use ip6.addr for reverse lookup not ip6.int. * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr_r): Likewise. Reported by Martin.v.Loewis@t-online.de [PR libc/2598]. 2001-10-19 Jakub Jelinek * misc/sys/cdefs.h (__attribute_used__): Define. * elf/rtld.c (_dl_start): Add __attribute_used__. * elf/dl-runtime.c (fixup, profile_fixup): Likewise. --- ChangeLog | 32 ++++++++++++++++++++++++++++++++ bits/dlfcn.h | 9 +++++++-- dlfcn/dlfcn.h | 7 +++++-- elf/dl-runtime.c | 4 ++-- elf/rtld.c | 2 +- malloc/obstack.c | 2 +- posix/getopt.c | 2 +- posix/regex.c | 2 +- resolv/gethnamaddr.c | 2 +- resolv/nss_dns/dns-host.c | 2 +- string/strxfrm.c | 2 +- sysdeps/generic/bits/dlfcn.h | 9 +++++++-- sysdeps/mips/bits/dlfcn.h | 9 +++++++-- 13 files changed, 67 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a6f930..90bdec7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2001-10-26 Ulrich Drepper + + * string/strxfrm.c [USE_IN_EXTENDED_LOCALE_MODEL]: Correctly get + nrules value. + +2001-10-24 H.J. Lu + + * sysdeps/generic/bits/dlfcn.h (DL_CALL_FCT): Cast to void *. + Use __BEGIN_DECLS/__END_DECLS around prototypes. + * sysdeps/mips/bits/dlfcn.h (DL_CALL_FCT): Likewise. + +2001-10-21 Jim Meyering + + * malloc/obstack.c (_): Honor the setting of ENABLE_NLS. Otherwise, + this code would end up calling gettext even in packages built + with --disable-nls. + * posix/getopt.c (_): Likewise. + * posix/regex.c (_): Likewise. + +2001-10-26 Ulrich Drepper + + * resolv/gethnamaddr.c (gethostbyaddr): Use ip6.addr for reverse + lookup not ip6.int. + * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr_r): Likewise. + Reported by Martin.v.Loewis@t-online.de [PR libc/2598]. + +2001-10-19 Jakub Jelinek + + * misc/sys/cdefs.h (__attribute_used__): Define. + * elf/rtld.c (_dl_start): Add __attribute_used__. + * elf/dl-runtime.c (fixup, profile_fixup): Likewise. + 2001-10-25 Andreas Schwab * stdlib/a64l.c: Expect least significant digit first. diff --git a/bits/dlfcn.h b/bits/dlfcn.h index 2525fa3..e96b5c1 100644 --- a/bits/dlfcn.h +++ b/bits/dlfcn.h @@ -1,5 +1,5 @@ /* System dependent definitions for run-time dynamic loading. - Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996,1997,1998,1999,2000,2001 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 @@ -52,8 +52,13 @@ foo = DL_CALL_FCT (fctp, (arg1, arg2)); */ # define DL_CALL_FCT(fctp, args) \ - (_dl_mcount_wrapper_check (fctp), (*(fctp)) args) + (_dl_mcount_wrapper_check ((void *) (fctp)), (*(fctp)) args) + +__BEGIN_DECLS /* This function calls the profiling functions. */ extern void _dl_mcount_wrapper_check (void *__selfpc) __THROW; + +__END_DECLS + #endif diff --git a/dlfcn/dlfcn.h b/dlfcn/dlfcn.h index 3fe4d02..6f88a89 100644 --- a/dlfcn/dlfcn.h +++ b/dlfcn/dlfcn.h @@ -1,5 +1,5 @@ /* User functions for run-time dynamic loading. - Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000, 2001 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 @@ -25,6 +25,7 @@ /* Collect various system dependent definitions and declarations. */ #include + #ifdef __USE_GNU /* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT the run-time address of the symbol called NAME in the next shared @@ -38,6 +39,7 @@ # define RTLD_DEFAULT ((void *) 0) #endif + __BEGIN_DECLS /* Open the shared object FILE and map it in; return a handle that can be @@ -66,6 +68,7 @@ extern void *dlvsym (void *__restrict __handle, the error string so that a following call returns null. */ extern char *dlerror (void) __THROW; + #ifdef __USE_GNU /* Structure containing information about object searched using `dladdr'. */ @@ -79,7 +82,7 @@ typedef struct /* Fill in *INFO with the following information about ADDRESS. Returns 0 iff no shared object's segments contain that address. */ -extern int dladdr (const void *__address, Dl_info *__info) __THROW; +extern int dladdr (__const void *__address, Dl_info *__info) __THROW; #endif __END_DECLS diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index 7a77f46..d9c99c4 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -42,7 +42,7 @@ function. */ #ifndef ELF_MACHINE_NO_PLT -static ElfW(Addr) __attribute__ ((unused)) +static ElfW(Addr) __attribute_used__ fixup ( # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS ELF_MACHINE_RUNTIME_FIXUP_ARGS, @@ -126,7 +126,7 @@ fixup ( #if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__ -static ElfW(Addr) __attribute__ ((unused)) +static ElfW(Addr) __attribute_used__ profile_fixup ( #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS ELF_MACHINE_RUNTIME_FIXUP_ARGS, diff --git a/elf/rtld.c b/elf/rtld.c index cf7f7ef..47ac3e3 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -145,7 +145,7 @@ RTLD_START # error "sysdeps/MACHINE/dl-machine.h fails to define RTLD_START" #endif -static ElfW(Addr) +static ElfW(Addr) __attribute_used__ _dl_start (void *arg) { struct link_map bootstrap_map; diff --git a/malloc/obstack.c b/malloc/obstack.c index 7b1206c..0244da3 100644 --- a/malloc/obstack.c +++ b/malloc/obstack.c @@ -459,7 +459,7 @@ _obstack_memory_used (h) /* Define the error handler. */ # ifndef _ -# if defined HAVE_LIBINTL_H || defined _LIBC +# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC # include # ifndef _ # define _(Str) gettext (Str) diff --git a/posix/getopt.c b/posix/getopt.c index df7127e..58ba104 100644 --- a/posix/getopt.c +++ b/posix/getopt.c @@ -78,7 +78,7 @@ #ifndef _ /* This is for other GNU distributions with internationalized messages. */ -# if defined HAVE_LIBINTL_H || defined _LIBC +# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC # include # ifndef _ # define _(msgid) gettext (msgid) diff --git a/posix/regex.c b/posix/regex.c index facb833..1435a80 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -91,7 +91,7 @@ # endif /* This is for other GNU distributions with internationalized messages. */ -# if HAVE_LIBINTL_H || defined _LIBC +# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC # include # ifdef _LIBC # undef gettext diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c index c13b106..117e4a3 100644 --- a/resolv/gethnamaddr.c +++ b/resolv/gethnamaddr.c @@ -690,7 +690,7 @@ gethostbyaddr(addr, len, af) uaddr[n] & 0xf, (uaddr[n] >> 4) & 0xf)); } - strcpy(qp, "ip6.int"); + strcpy(qp, "ip6.arpa"); break; default: abort(); diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index 2102f63..a75e9df 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -282,7 +282,7 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af, qp = qbuf; for (n = IN6ADDRSZ - 1; n >= 0; n--) qp += sprintf (qp, "%x.%x.", uaddr[n] & 0xf, (uaddr[n] >> 4) & 0xf); - strcpy (qp, "ip6.int"); + strcpy (qp, "ip6.arpa"); break; default: /* Cannot happen. */ diff --git a/string/strxfrm.c b/string/strxfrm.c index 1dc3c47..257ce49 100644 --- a/string/strxfrm.c +++ b/string/strxfrm.c @@ -96,7 +96,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) { #ifdef USE_IN_EXTENDED_LOCALE_MODEL struct locale_data *current = l->__locales[LC_COLLATE]; - uint_fast32_t nrules = *((const uint32_t *) current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].string); + uint_fast32_t nrules = current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].word; #else uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); #endif diff --git a/sysdeps/generic/bits/dlfcn.h b/sysdeps/generic/bits/dlfcn.h index 2525fa3..e96b5c1 100644 --- a/sysdeps/generic/bits/dlfcn.h +++ b/sysdeps/generic/bits/dlfcn.h @@ -1,5 +1,5 @@ /* System dependent definitions for run-time dynamic loading. - Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996,1997,1998,1999,2000,2001 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 @@ -52,8 +52,13 @@ foo = DL_CALL_FCT (fctp, (arg1, arg2)); */ # define DL_CALL_FCT(fctp, args) \ - (_dl_mcount_wrapper_check (fctp), (*(fctp)) args) + (_dl_mcount_wrapper_check ((void *) (fctp)), (*(fctp)) args) + +__BEGIN_DECLS /* This function calls the profiling functions. */ extern void _dl_mcount_wrapper_check (void *__selfpc) __THROW; + +__END_DECLS + #endif diff --git a/sysdeps/mips/bits/dlfcn.h b/sysdeps/mips/bits/dlfcn.h index 2380caa..c5b4c59 100644 --- a/sysdeps/mips/bits/dlfcn.h +++ b/sysdeps/mips/bits/dlfcn.h @@ -1,5 +1,5 @@ /* System dependent definitions for run-time dynamic loading. - Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999, 2000, 2001 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 @@ -52,8 +52,13 @@ foo = DL_CALL_FCT (fctp, (arg1, arg2)); */ # define DL_CALL_FCT(fctp, args) \ - (_dl_mcount_wrapper_check (fctp), (*(fctp)) args) + (_dl_mcount_wrapper_check ((void *) (fctp)), (*(fctp)) args) + +__BEGIN_DECLS /* This function calls the profiling functions. */ extern void _dl_mcount_wrapper_check (void *__selfpc) __THROW; + +__END_DECLS + #endif -- 2.7.4