[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r8439 - in /branches/eglibc-2_10/libc: ./ gshadow/ nss/ sysdeps/unix/sysv/linux/i386/ sysdeps/x86_64/
- To: commits@xxxxxxxxxx
- Subject: [commits] r8439 - in /branches/eglibc-2_10/libc: ./ gshadow/ nss/ sysdeps/unix/sysv/linux/i386/ sysdeps/x86_64/
- From: joseph@xxxxxxxxxx
- Date: Mon, 11 May 2009 12:19:48 -0000
Author: joseph
Date: Mon May 11 05:19:47 2009
New Revision: 8439
Log:
Merge changes between r8426 and r8438 from /fsf/glibc-2_10-branch.
Modified:
branches/eglibc-2_10/libc/ChangeLog
branches/eglibc-2_10/libc/gshadow/Versions
branches/eglibc-2_10/libc/gshadow/getsgent_r.c
branches/eglibc-2_10/libc/gshadow/getsgnam_r.c
branches/eglibc-2_10/libc/nss/getXXbyYY_r.c
branches/eglibc-2_10/libc/nss/getXXent_r.c
branches/eglibc-2_10/libc/sysdeps/unix/sysv/linux/i386/sysconf.c
branches/eglibc-2_10/libc/sysdeps/x86_64/cacheinfo.c
Modified: branches/eglibc-2_10/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_10/libc/ChangeLog (original)
+++ branches/eglibc-2_10/libc/ChangeLog Mon May 11 05:19:47 2009
@@ -1,3 +1,19 @@
+2009-05-10 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * 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@xxxxxxxxxx>
* version.h (VERSION): Bump for 2.10 release.
Modified: branches/eglibc-2_10/libc/gshadow/Versions
==============================================================================
--- branches/eglibc-2_10/libc/gshadow/Versions (original)
+++ branches/eglibc-2_10/libc/gshadow/Versions Mon May 11 05:19:47 2009
@@ -7,7 +7,7 @@
fgetsgent; fgetsgent_r;
# g*
- getsgent; getsgent_r; getsgnam; getsgnam_r; getsgent_r; getsgnam_r;
+ getsgent; getsgent_r; getsgnam; getsgnam_r;
# p*
putsgent;
Modified: branches/eglibc-2_10/libc/gshadow/getsgent_r.c
==============================================================================
--- branches/eglibc-2_10/libc/gshadow/getsgent_r.c (original)
+++ branches/eglibc-2_10/libc/gshadow/getsgent_r.c Mon May 11 05:19:47 2009
@@ -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"
Modified: branches/eglibc-2_10/libc/gshadow/getsgnam_r.c
==============================================================================
--- branches/eglibc-2_10/libc/gshadow/getsgnam_r.c (original)
+++ branches/eglibc-2_10/libc/gshadow/getsgnam_r.c Mon May 11 05:19:47 2009
@@ -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"
Modified: branches/eglibc-2_10/libc/nss/getXXbyYY_r.c
==============================================================================
--- branches/eglibc-2_10/libc/nss/getXXbyYY_r.c (original)
+++ branches/eglibc-2_10/libc/nss/getXXbyYY_r.c Mon May 11 05:19:47 2009
@@ -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@xxxxxxxxxx>, 1996.
@@ -301,7 +301,9 @@
}
-#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)
Modified: branches/eglibc-2_10/libc/nss/getXXent_r.c
==============================================================================
--- branches/eglibc-2_10/libc/nss/getXXent_r.c (original)
+++ branches/eglibc-2_10/libc/nss/getXXent_r.c Mon May 11 05:19:47 2009
@@ -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@xxxxxxxxxx>, 1996.
@@ -170,10 +170,13 @@
}
-#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 @@
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)
Modified: branches/eglibc-2_10/libc/sysdeps/unix/sysv/linux/i386/sysconf.c
==============================================================================
--- branches/eglibc-2_10/libc/sysdeps/unix/sysv/linux/i386/sysconf.c (original)
+++ branches/eglibc-2_10/libc/sysdeps/unix/sysv/linux/i386/sysconf.c Mon May 11 05:19:47 2009
@@ -80,6 +80,7 @@
{ 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 },
Modified: branches/eglibc-2_10/libc/sysdeps/x86_64/cacheinfo.c
==============================================================================
--- branches/eglibc-2_10/libc/sysdeps/x86_64/cacheinfo.c (original)
+++ branches/eglibc-2_10/libc/sysdeps/x86_64/cacheinfo.c Mon May 11 05:19:47 2009
@@ -42,6 +42,7 @@
{ 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 },