From 2f7f7bc65803510cdf137bde00fdb72c918af63c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 16 Jun 2003 17:18:06 +0000 Subject: [PATCH] Update. 2003-06-16 Thorsten Kukuk * include/libc-symbols.h: Add static_link_warning macro. * grp/initgroups.c: Print linker warning if this function is called in a static linked binary. * nss/getXXbyYY.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. 2003-06-16 Bruno Haible * iconvdata/gconv-modules (ISO-8859-15): Add aliases ISO_8859-15, LATIN-9. (ISO-8859-16): Add aliases ISO_8859-16:2001, ISO_8859-16. (IBM1047): Add alias IBM-1047. (GBK): Add aliases MS936, WINDOWS-936. 2003-06-16 Jakub Jelinek * sysdeps/unix/sysv/linux/xstatconv.c (__xstat_conv): Define even if defined __ASSUME_STAT64_SYSCALL && defined XSTAT_IS_XSTAT64. (__xstat64_conv): Change xstat_conv to __xstat_conv. Reported by Arnaud Desitter . --- ChangeLog | 28 ++++++++++++++++++++++++++-- grp/initgroups.c | 4 ++++ iconvdata/gconv-modules | 7 +++++++ include/libc-symbols.h | 10 ++++++++++ localedata/ChangeLog | 7 +++++++ localedata/charmaps/GBK | 3 +++ localedata/charmaps/IBM1047 | 1 + localedata/charmaps/ISO-8859-15 | 2 ++ localedata/charmaps/ISO-8859-16 | 2 ++ nss/getXXbyYY.c | 2 ++ nss/getXXbyYY_r.c | 2 ++ nss/getXXent.c | 2 ++ nss/getXXent_r.c | 4 ++++ sysdeps/posix/getaddrinfo.c | 2 ++ sysdeps/unix/sysv/linux/xstatconv.c | 4 ++-- 15 files changed, 76 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36e4169..aa4c8ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2003-06-16 Thorsten Kukuk + + * include/libc-symbols.h: Add static_link_warning macro. + * grp/initgroups.c: Print linker warning if this function + is called in a static linked binary. + * nss/getXXbyYY.c: Likewise. + * nss/getXXbyYY_r.c: Likewise. + * nss/getXXent.c: Likewise. + * nss/getXXent_r.c: Likewise. + * sysdeps/posix/getaddrinfo.c: Likewise. + +2003-06-16 Bruno Haible + + * iconvdata/gconv-modules (ISO-8859-15): Add aliases ISO_8859-15, + LATIN-9. + (ISO-8859-16): Add aliases ISO_8859-16:2001, ISO_8859-16. + (IBM1047): Add alias IBM-1047. + (GBK): Add aliases MS936, WINDOWS-936. + +2003-06-16 Jakub Jelinek + + * sysdeps/unix/sysv/linux/xstatconv.c (__xstat_conv): Define even if + defined __ASSUME_STAT64_SYSCALL && defined XSTAT_IS_XSTAT64. + (__xstat64_conv): Change xstat_conv to __xstat_conv. + 2003-06-16 Ulrich Drepper * locale/iso-639.def: Update from current official ISO 639. @@ -10,8 +35,7 @@ of MXCSR. * sysdeps/i386/fpu/fedisblxcpt.c (fedisableexcept): Likewise. * sysdeps/i386/fpu/feholdexcpt.c (feholdexcept): Likewise. - Reported by Arnaud Desitter - . + Reported by Arnaud Desitter . * math/tgmath.h (carg): Handle real arguments. (conj): Likewise. diff --git a/grp/initgroups.c b/grp/initgroups.c index 1e4c2b5..4b19594 100644 --- a/grp/initgroups.c +++ b/grp/initgroups.c @@ -223,6 +223,8 @@ getgrouplist (const char *user, gid_t group, gid_t *groups, int *ngroups) return result; } +static_link_warning (getgrouplist) + /* Initialize the group set for the current user by reading the group database and using all groups of which USER is a member. Also include GROUP. */ @@ -271,3 +273,5 @@ initgroups (const char *user, gid_t group) return result; #endif } + +static_link_warning (initgroups) diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index 7a08baa..5df8767 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -393,6 +393,8 @@ module INTERNAL ISO-8859-14// ISO8859-14 1 alias ISO8859-15// ISO-8859-15// alias ISO885915// ISO-8859-15// alias ISO-IR-203// ISO-8859-15// +alias ISO_8859-15// ISO-8859-15// +alias LATIN-9// ISO-8859-15// alias ISO_8859-15:1998// ISO-8859-15// module ISO-8859-15// INTERNAL ISO8859-15 1 module INTERNAL ISO-8859-15// ISO8859-15 1 @@ -403,6 +405,8 @@ alias ISO885916// ISO-8859-16// alias ISO-IR-226// ISO-8859-16// alias LATIN10// ISO-8859-16// alias L10// ISO-8859-16// +alias ISO_8859-16:2001// ISO-8859-16// +alias ISO_8859-16// ISO-8859-16// module ISO-8859-16// INTERNAL ISO8859-16 1 module INTERNAL ISO-8859-16// ISO8859-16 1 @@ -996,6 +1000,7 @@ module IBM1046// INTERNAL IBM1046 1 module INTERNAL IBM1046// IBM1046 1 # from to module cost +alias IBM-1047// IBM1047// alias CP1047// IBM1047// alias 1047// IBM1047// alias OSF10020417// IBM1047// @@ -1122,6 +1127,8 @@ module BIG5// EUC-CN// GBBIG5 1 # from to module cost alias GB13000// GBK// alias CP936// GBK// +alias MS936// GBK// +alias WINDOWS-936// GBK// module GBK// INTERNAL GBK 1 module INTERNAL GBK// GBK 1 diff --git a/include/libc-symbols.h b/include/libc-symbols.h index e585a3b..fe5b6e5 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -282,6 +282,16 @@ link_warning (name, \ "warning: " #name " is not implemented and will always fail") +/* Warning for linking functions calling dlopen into static binaries. */ +#ifdef SHARED +#define static_link_warning(name) +#else +#define static_link_warning(name) static_link_warning1(name) +#define static_link_warning1(name) \ + link_warning(name, "Using '" #name "' in statically linked applications \ +requires at runtime the shared libraries from the glibc version used \ +for linking") +#endif /* Declare SYMBOL to be TYPE (`function' or `object') and of SIZE bytes, when the assembler supports such declarations (such as in ELF). diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 3872a27..0bf60e9 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,10 @@ +2003-06-16 Bruno Haible + + * charmaps/ISO-8859-15: Add aliases ISO_8859-15, LATIN-9. + * charmaps/ISO-8859-16: Add aliases ISO_8859-16:2001, ISO_8859-16. + * charmaps/IBM1047: Add alias IBM-1047. + * charmaps/GBK: Add aliases CP936, MS936, WINDOWS-936. + 2003-06-15 Petter Reinholdtsen * locales/fi_FI [LC_TIME]: Correct month names to make the dates diff --git a/localedata/charmaps/GBK b/localedata/charmaps/GBK index 285d183..4c35f14 100644 --- a/localedata/charmaps/GBK +++ b/localedata/charmaps/GBK @@ -4,6 +4,9 @@ % / +% alias CP936 +% alias MS936 +% alias WINDOWS-936 CHARMAP /x00 NULL (NUL) /x01 START OF HEADING (SOH) diff --git a/localedata/charmaps/IBM1047 b/localedata/charmaps/IBM1047 index 5123851..89e0b03 100644 --- a/localedata/charmaps/IBM1047 +++ b/localedata/charmaps/IBM1047 @@ -6,6 +6,7 @@ % Registry SC09-1391-00 p 150. +% alias IBM-1047 % alias CP1047 % alias 1047 CHARMAP diff --git a/localedata/charmaps/ISO-8859-15 b/localedata/charmaps/ISO-8859-15 index 0e15867..1c92b27 100644 --- a/localedata/charmaps/ISO-8859-15 +++ b/localedata/charmaps/ISO-8859-15 @@ -3,6 +3,8 @@ / % automatically generated from the charDB +% alias ISO_8859-15 +% alias LATIN-9 CHARMAP /x00 NULL /x01 START OF HEADING diff --git a/localedata/charmaps/ISO-8859-16 b/localedata/charmaps/ISO-8859-16 index 83fdeb7..cf4e06c 100644 --- a/localedata/charmaps/ISO-8859-16 +++ b/localedata/charmaps/ISO-8859-16 @@ -4,6 +4,8 @@ % automatically generated from the charDB % alias ISO-IR-226 +% alias ISO_8859-16:2001 +% alias ISO_8859-16 % alias LATIN10 % alias L10 CHARMAP diff --git a/nss/getXXbyYY.c b/nss/getXXbyYY.c index a9f1cfd..ece2a0d 100644 --- a/nss/getXXbyYY.c +++ b/nss/getXXbyYY.c @@ -162,3 +162,5 @@ done: return result; } + +static_link_warning (FUNCTION_NAME) diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index 06f2abe..aca6a94 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -289,3 +289,5 @@ strong_alias (INTERNAL (REENTRANT_NAME), NEW (REENTRANT_NAME)); versioned_symbol (libc, real, name, version) do_default_symbol_version (NEW (REENTRANT_NAME), REENTRANT_NAME, GLIBC_2_1_2); + +static_link_warning (REENTRANT_NAME) diff --git a/nss/getXXent.c b/nss/getXXent.c index 0a13b79..60e1395 100644 --- a/nss/getXXent.c +++ b/nss/getXXent.c @@ -91,3 +91,5 @@ GETFUNC_NAME (void) __set_errno (save); return result; } + +static_link_warning (GETFUNC_NAME) diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c index 5a1e3e9..8a0155b 100644 --- a/nss/getXXent_r.c +++ b/nss/getXXent_r.c @@ -201,3 +201,7 @@ strong_alias (INTERNAL (REENTRANT_GETNAME), NEW (REENTRANT_GETNAME)); versioned_symbol (libc, real, name, version) do_default_symbol_version (NEW (REENTRANT_GETNAME), REENTRANT_GETNAME, GLIBC_2_1_2); + +static_link_warning (SETFUNC_NAME) +static_link_warning (ENDFUNC_NAME) +static_link_warning (REENTRANT_GETNAME) diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 3cdb5df..3b86b25 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -1024,6 +1024,8 @@ getaddrinfo (const char *name, const char *service, } libc_hidden_def (getaddrinfo) +static_link_warning (getaddrinfo) + void freeaddrinfo (struct addrinfo *ai) { diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c index 4e4defb..805e339 100644 --- a/sysdeps/unix/sysv/linux/xstatconv.c +++ b/sysdeps/unix/sysv/linux/xstatconv.c @@ -31,7 +31,7 @@ struct kernel_stat; #include -#ifndef __ASSUME_STAT64_SYSCALL +#if !defined __ASSUME_STAT64_SYSCALL || defined XSTAT_IS_XSTAT64 int __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf) { @@ -108,7 +108,7 @@ int __xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf) { #ifdef XSTAT_IS_XSTAT64 - return xstat_conv (vers, kbuf, ubuf); + return __xstat_conv (vers, kbuf, ubuf); #else switch (vers) { -- 2.7.4