diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | gshadow/Versions | 2 | ||||
| -rw-r--r-- | gshadow/getsgent_r.c | 1 | ||||
| -rw-r--r-- | gshadow/getsgnam_r.c | 1 | ||||
| -rw-r--r-- | nss/getXXbyYY_r.c | 6 | ||||
| -rw-r--r-- | nss/getXXent_r.c | 20 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysconf.c | 1 | ||||
| -rw-r--r-- | sysdeps/x86_64/cacheinfo.c | 1 | ||||
| -rw-r--r-- | version.h | 2 |
9 files changed, 38 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 2eb3c61f2a..e3afa8543c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2009-05-10 Ulrich Drepper <drepper@redhat.com> + + * version.h (VERSION): Bump to 2.10.1. + + * nss/getXXbyYY_r.c: If NO_COMPAT_NEEDED is defined don't define any + compatibility functions. + * nss/getXXent_r.c: Likewise. + * gshadow/getsgent_r.c: Define NO_COMPAT_NEEDED. + * gshadow/getsgnam_r.c: Likewise. + * gshadow/Version: Remove duplicate entries. + + * sysdeps/x86_64/cacheinfo.c (intel_02_cache_info): Add missing entries + for recent processor. + * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_02_cache_info): + Likewise. + 2009-05-09 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump for 2.10 release. diff --git a/gshadow/Versions b/gshadow/Versions index 00a410b74f..1dba0c5f19 100644 --- a/gshadow/Versions +++ b/gshadow/Versions @@ -7,7 +7,7 @@ libc { fgetsgent; fgetsgent_r; # g* - getsgent; getsgent_r; getsgnam; getsgnam_r; getsgent_r; getsgnam_r; + getsgent; getsgent_r; getsgnam; getsgnam_r; # p* putsgent; diff --git a/gshadow/getsgent_r.c b/gshadow/getsgent_r.c index 336110ec89..9feea9f047 100644 --- a/gshadow/getsgent_r.c +++ b/gshadow/getsgent_r.c @@ -26,5 +26,6 @@ #define ENDFUNC_NAME endsgent #define DATABASE_NAME gshadow #define BUFLEN 1024 +#define NO_COMPAT_NEEDED 1 #include "../nss/getXXent_r.c" diff --git a/gshadow/getsgnam_r.c b/gshadow/getsgnam_r.c index c89fb06bfa..a9ab764675 100644 --- a/gshadow/getsgnam_r.c +++ b/gshadow/getsgnam_r.c @@ -26,5 +26,6 @@ #define ADD_PARAMS const char *name #define ADD_VARIABLES name #define BUFLEN 1024 +#define NO_COMPAT_NEEDED 1 #include "../nss/getXXbyYY_r.c" diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index b535f67a7b..16dadd70ef 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2004, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1996-2004, 2006, 2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -301,7 +301,9 @@ done: } -#ifndef FUNCTION2_NAME +#ifdef NO_COMPAT_NEEDED +strong_alias (INTERNAL (REENTRANT_NAME), REENTRANT_NAME); +#elif !defined FUNCTION2_NAME # include <shlib-compat.h> # if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1_2) # define OLD(name) OLD1 (name) diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c index 7a881c02ac..d53caeff40 100644 --- a/nss/getXXent_r.c +++ b/nss/getXXent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2000,2002,2004,2007 Free Software Foundation, Inc. +/* Copyright (C) 1996-2000,2002,2004,2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -170,10 +170,13 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen, } -#include <shlib-compat.h> -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1_2) -#define OLD(name) OLD1 (name) -#define OLD1(name) __old_##name +#ifdef NO_COMPAT_NEEDED +strong_alias (INTERNAL (REENTRANT_GETNAME), REENTRANT_GETNAME); +#else +# include <shlib-compat.h> +# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1_2) +# define OLD(name) OLD1 (name) +# define OLD1(name) __old_##name int attribute_compat_text_section @@ -189,20 +192,21 @@ OLD (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen, return ret; } -#define do_symbol_version(real, name, version) \ +# define do_symbol_version(real, name, version) \ compat_symbol (libc, real, name, version) do_symbol_version (OLD (REENTRANT_GETNAME), REENTRANT_GETNAME, GLIBC_2_0); -#endif +# endif /* As INTERNAL (REENTRANT_GETNAME) may be hidden, we need an alias in between so that the REENTRANT_GETNAME@@GLIBC_2.1.2 is not hidden too. */ strong_alias (INTERNAL (REENTRANT_GETNAME), NEW (REENTRANT_GETNAME)); -#define do_default_symbol_version(real, name, version) \ +# define do_default_symbol_version(real, name, version) \ versioned_symbol (libc, real, name, version) do_default_symbol_version (NEW (REENTRANT_GETNAME), REENTRANT_GETNAME, GLIBC_2_1_2); +#endif static_link_warning (SETFUNC_NAME) static_link_warning (ENDFUNC_NAME) diff --git a/sysdeps/unix/sysv/linux/i386/sysconf.c b/sysdeps/unix/sysv/linux/i386/sysconf.c index b1c93d7359..f59e0c3fad 100644 --- a/sysdeps/unix/sysv/linux/i386/sysconf.c +++ b/sysdeps/unix/sysv/linux/i386/sysconf.c @@ -80,6 +80,7 @@ static const struct intel_02_cache_info { 0x0a, _SC_LEVEL1_DCACHE_SIZE, 8192, 2, 32 }, { 0x0c, _SC_LEVEL1_DCACHE_SIZE, 16384, 4, 32 }, { 0x0d, _SC_LEVEL1_DCACHE_SIZE, 16384, 4, 64 }, + { 0x21, _SC_LEVEL2_CACHE_SIZE, 262144, 8, 64 }, { 0x22, _SC_LEVEL3_CACHE_SIZE, 524288, 4, 64 }, { 0x23, _SC_LEVEL3_CACHE_SIZE, 1048576, 8, 64 }, { 0x25, _SC_LEVEL3_CACHE_SIZE, 2097152, 8, 64 }, diff --git a/sysdeps/x86_64/cacheinfo.c b/sysdeps/x86_64/cacheinfo.c index 8769e9c966..1ec4ca19c9 100644 --- a/sysdeps/x86_64/cacheinfo.c +++ b/sysdeps/x86_64/cacheinfo.c @@ -42,6 +42,7 @@ static const struct intel_02_cache_info { 0x0a, _SC_LEVEL1_DCACHE_SIZE, 8192, 2, 32 }, { 0x0c, _SC_LEVEL1_DCACHE_SIZE, 16384, 4, 32 }, { 0x0d, _SC_LEVEL1_DCACHE_SIZE, 16384, 4, 64 }, + { 0x21, _SC_LEVEL2_CACHE_SIZE, 262144, 8, 64 }, { 0x22, _SC_LEVEL3_CACHE_SIZE, 524288, 4, 64 }, { 0x23, _SC_LEVEL3_CACHE_SIZE, 1048576, 8, 64 }, { 0x25, _SC_LEVEL3_CACHE_SIZE, 2097152, 8, 64 }, diff --git a/version.h b/version.h index 55360008f4..f169c6a0fa 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ #define RELEASE "stable" -#define VERSION "2.10" +#define VERSION "2.10.1" |