mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 17:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated to fedora-glibc-20090510T1842

Browse Source
This commit is contained in:
Jakub Jelinek 2009-05-10 18:50:01 +00:00
parent d79f04c30e
commit 4595c33e21
11 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -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.

4
fedora/branch.mk
View File

@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-f8
fedora-sync-date := 2009-05-09 22:00 UTC
fedora-sync-tag := fedora-glibc-20090509T2200
fedora-sync-date := 2009-05-10 18:42 UTC
fedora-sync-tag := fedora-glibc-20090510T1842

5
fedora/glibc.spec.in
View File

@ -19,7 +19,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: @glibcversion@
Release: 2
Release: 1
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -1009,6 +1009,9 @@ rm -f *.filelist*
%endif
%changelog
* Sun May 10 2009 Jakub Jelinek <jakub@redhat.com> 2.10.1-1
- fix up getsgent_r and getsgnam_r exports on i?86 and ppc
* Sat May 9 2009 Jakub Jelinek <jakub@redhat.com> 2.10-2
- update from trunk
- glibc 2.10 release

2
gshadow/Versions
View File

@ -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;

1
gshadow/getsgent_r.c
View File

@ -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"

1
gshadow/getsgnam_r.c
View File

@ -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"

6
nss/getXXbyYY_r.c
View File

@ -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)

20
nss/getXXent_r.c
View File

@ -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)

1
sysdeps/unix/sysv/linux/i386/sysconf.c
View File

@ -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 },

1
sysdeps/x86_64/cacheinfo.c
View File

@ -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 },

2
version.h
View File

@ -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"