rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2.6-3

Browse Source
This commit is contained in:
Jakub Jelinek 2007-05-24 10:40:34 +00:00
parent a7bc5af755
commit 2ac6e81c72
3 changed files with 88 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
glibc-fedora.patch
View File

@ -1,6 +1,12 @@
--- glibc-20070515T2025/ChangeLog 15 May 2007 20:24:57 -0000 1.10641 --- glibc-20070515T2025/ChangeLog 15 May 2007 20:24:57 -0000 1.10641
+++ glibc-20070515T2025-fedora/ChangeLog 21 May 2007 20:00:48 -0000 1.8782.2.245 +++ glibc-20070515T2025-fedora/ChangeLog 24 May 2007 10:33:00 -0000 1.8782.2.246
@@ -1,3 +1,58 @@ @@ -1,3 +1,64 @@
+2007-01-15 Jakub Jelinek <jakub@redhat.com>
+
+ * elf/dl-open.c (add_to_global): If the main searchlist is 256
+ entries or more, on each reallocation at least double the size
+ of the search list rather than growing it linearly.
+
+2007-05-21 Ulrich Drepper <drepper@redhat.com> +2007-05-21 Ulrich Drepper <drepper@redhat.com>
+ +
+ * sysdeps/unix/sysv/linux/i386/epoll_pwait.S: New file. + * sysdeps/unix/sysv/linux/i386/epoll_pwait.S: New file.
@ -59,7 +65,7 @@
2007-05-14 Ulrich Drepper <drepper@redhat.com> 2007-05-14 Ulrich Drepper <drepper@redhat.com>
* version.h (VERSION): Define to 6. * version.h (VERSION): Define to 6.
@@ -71,6 +126,13 @@ @@ -71,6 +132,13 @@
* include/sys/cdefs.h: Redefine __nonnull so that test for * include/sys/cdefs.h: Redefine __nonnull so that test for
incorrect parameters in the libc code itself are not omitted. incorrect parameters in the libc code itself are not omitted.
@ -73,7 +79,7 @@
2007-05-09 Jakub Jelinek <jakub@redhat.com> 2007-05-09 Jakub Jelinek <jakub@redhat.com>
* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
@@ -366,6 +428,10 @@ @@ -366,6 +434,10 @@
[BZ #4368] [BZ #4368]
* stdlib/stdlib.h: Remove obsolete part of comment for realpath. * stdlib/stdlib.h: Remove obsolete part of comment for realpath.
@ -84,7 +90,7 @@
2007-04-16 Ulrich Drepper <drepper@redhat.com> 2007-04-16 Ulrich Drepper <drepper@redhat.com>
[BZ #4364] [BZ #4364]
@@ -1623,6 +1689,15 @@ @@ -1623,6 +1695,15 @@
separators also if no non-zero digits found. separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3. * stdlib/Makefile (tests): Add tst-strtod3.
@ -408,6 +414,30 @@
# define O 0 # define O 0
#else #else
# define O 1 # define O 1
--- glibc-20070515T2025/elf/dl-open.c 11 May 2007 21:34:32 -0000 1.139
+++ glibc-20070515T2025-fedora/elf/dl-open.c 24 May 2007 10:33:02 -0000 1.111.2.18
@@ -125,14 +125,18 @@ add_to_global (struct link_map *new)
{
/* We have to extend the existing array of link maps in the
main map. */
+ size_t new_size = ns->_ns_global_scope_alloc;
+ if (new_size >= 256 && new_size > to_add + 8)
+ new_size *= 2;
+ else
+ new_size += to_add + 8;
new_global = (struct link_map **)
realloc (ns->_ns_main_searchlist->r_list,
- ((ns->_ns_global_scope_alloc + to_add + 8)
- * sizeof (struct link_map *)));
+ new_size * sizeof (struct link_map *));
if (new_global == NULL)
goto nomem;
- ns->_ns_global_scope_alloc += to_add + 8;
+ ns->_ns_global_scope_alloc = new_size;
ns->_ns_main_searchlist->r_list = new_global;
}
--- glibc-20070515T2025/elf/ldconfig.c 13 Apr 2007 19:53:20 -0000 1.59 --- glibc-20070515T2025/elf/ldconfig.c 13 Apr 2007 19:53:20 -0000 1.59
+++ glibc-20070515T2025-fedora/elf/ldconfig.c 16 Apr 2007 23:59:03 -0000 1.47.2.14 +++ glibc-20070515T2025-fedora/elf/ldconfig.c 16 Apr 2007 23:59:03 -0000 1.47.2.14
@@ -965,17 +965,19 @@ search_dirs (void) @@ -965,17 +965,19 @@ search_dirs (void)
@ -1371,8 +1401,14 @@
-#SETENT_BATCH_READ=TRUE -#SETENT_BATCH_READ=TRUE
+SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE
--- glibc-20070515T2025/nptl/ChangeLog 15 May 2007 06:32:02 -0000 1.970 --- glibc-20070515T2025/nptl/ChangeLog 15 May 2007 06:32:02 -0000 1.970
+++ glibc-20070515T2025-fedora/nptl/ChangeLog 21 May 2007 20:01:10 -0000 1.706.2.125 +++ glibc-20070515T2025-fedora/nptl/ChangeLog 24 May 2007 10:33:02 -0000 1.706.2.126
@@ -1,3 +1,16 @@ @@ -1,3 +1,22 @@
+2007-01-15 Jakub Jelinek <jakub@redhat.com>
+
+ * pthread_create.c (__pthread_create_2_1): On the first pthread_create
+ in a process make sure main search list can store at least 256
+ entries.
+
+2007-05-17 Ulrich Drepper <drepper@redhat.com> +2007-05-17 Ulrich Drepper <drepper@redhat.com>
+ +
+ [BZ #4512] + [BZ #4512]
@ -1389,7 +1425,7 @@
2007-05-14 Ulrich Drepper <drepper@redhat.com> 2007-05-14 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Remove unnecessary * sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Remove unnecessary
@@ -1474,6 +1487,15 @@ @@ -1474,6 +1493,15 @@
Use __sigfillset. Document that sigfillset does the right thing wrt Use __sigfillset. Document that sigfillset does the right thing wrt
to SIGSETXID. to SIGSETXID.
@ -1405,7 +1441,7 @@
2005-07-11 Jakub Jelinek <jakub@redhat.com> 2005-07-11 Jakub Jelinek <jakub@redhat.com>
[BZ #1102] [BZ #1102]
@@ -2210,6 +2232,11 @@ @@ -2210,6 +2238,11 @@
Move definition inside libpthread, libc, librt check. Provide Move definition inside libpthread, libc, librt check. Provide
definition for rtld. definition for rtld.
@ -1417,7 +1453,7 @@
2004-09-02 Ulrich Drepper <drepper@redhat.com> 2004-09-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
@@ -4284,6 +4311,11 @@ @@ -4284,6 +4317,11 @@
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
@ -1482,6 +1518,39 @@
else else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif endif
--- glibc-20070515T2025/nptl/pthread_create.c 5 Sep 2006 17:12:15 -0000 1.54
+++ glibc-20070515T2025-fedora/nptl/pthread_create.c 24 May 2007 10:33:02 -0000 1.34.2.18
@@ -462,6 +462,30 @@ __pthread_create_2_1 (newthread, attr, s
pd->flags = ((iattr->flags & ~(ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET))
| (self->flags & (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET)));
+ /* Hack: realloc the main search list on the first pthread_create call
+ to minimize the number of global search scope reallocations.
+ Wastes at most 1KB on 32-bit and 2KB on 64-bit per process
+ which calls pthread_create. */
+ if (__builtin_expect (self->header.multiple_threads == 0, 0)
+ && GL(dl_ns)[0]._ns_main_searchlist
+ && GL(dl_ns)[0]._ns_main_searchlist->r_nlist < 256
+ && GL(dl_ns)[0]._ns_global_scope_alloc < 256)
+ {
+ struct link_map **new_global = (struct link_map **)
+ realloc (GL(dl_ns)[0]._ns_global_scope_alloc == 0
+ ? NULL : GL(dl_ns)[0]._ns_main_searchlist->r_list,
+ 256 * sizeof (struct link_map *));
+ if (new_global != NULL)
+ {
+ if (GL(dl_ns)[0]._ns_global_scope_alloc == 0)
+ memcpy (new_global, GL(dl_ns)[0]._ns_main_searchlist->r_list,
+ GL(dl_ns)[0]._ns_main_searchlist->r_nlist
+ * sizeof (struct link_map *));
+ GL(dl_ns)[0]._ns_global_scope_alloc = 256;
+ GL(dl_ns)[0]._ns_main_searchlist->r_list = new_global;
+ }
+ }
+
/* Initialize the field for the ID of the thread which is waiting
for us. This is a self-reference in case the thread is created
detached. */
--- glibc-20070515T2025/nptl/pthread_mutex_lock.c 14 Aug 2006 23:01:26 -0000 1.15 --- glibc-20070515T2025/nptl/pthread_mutex_lock.c 14 Aug 2006 23:01:26 -0000 1.15
+++ glibc-20070515T2025-fedora/nptl/pthread_mutex_lock.c 21 May 2007 20:01:11 -0000 1.8.2.7 +++ glibc-20070515T2025-fedora/nptl/pthread_mutex_lock.c 21 May 2007 20:01:11 -0000 1.8.2.7
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@

10
glibc.spec
View File

@ -3,7 +3,7 @@
%define glibcsrcdir glibc-20070515T2025 %define glibcsrcdir glibc-20070515T2025
%define glibc_release_tarballs 0 %define glibc_release_tarballs 0
%define glibcversion 2.6 %define glibcversion 2.6
%define glibcrelease 2 %define glibcrelease 3
%define auxarches i586 i686 athlon sparcv9 alphaev6 %define auxarches i586 i686 athlon sparcv9 alphaev6
%define xenarches i686 athlon %define xenarches i686 athlon
%ifarch %{xenarches} %ifarch %{xenarches}
@ -1511,7 +1511,7 @@ rm -f *.filelist*
%files -f common.filelist common %files -f common.filelist common
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_prefix}/lib/locale %dir %{_prefix}/lib/locale
%attr(0644,root,root) %config(missingok) %{_prefix}/lib/locale/locale-archive.tmpl %attr(0644,root,root) %verify(not md5 size mtime) %{_prefix}/lib/locale/locale-archive.tmpl
%attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive %attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive
%dir %attr(755,root,root) /etc/default %dir %attr(755,root,root) /etc/default
%verify(not md5 size mtime) %config(noreplace) /etc/default/nss %verify(not md5 size mtime) %config(noreplace) /etc/default/nss
@ -1566,6 +1566,12 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Thu May 24 2007 Jakub Jelinek <jakub@redhat.com> 2.6-3
- don't use %%config(missingok) for locale-archive.tmpl,
instead of removing it altogether truncate it to zero
size (#240697)
- add a workaround for #210748
* Mon May 21 2007 Jakub Jelinek <jakub@redhat.com> 2.6-2 * Mon May 21 2007 Jakub Jelinek <jakub@redhat.com> 2.6-2
- restore malloc_set_state backwards compatibility (#239344) - restore malloc_set_state backwards compatibility (#239344)
- fix epoll_pwait (BZ#4525) - fix epoll_pwait (BZ#4525)

2
sources
View File

@ -1,2 +1,2 @@
9e33d4d525c8317685e925972f0f145b glibc-20070515T2025.tar.bz2 9e33d4d525c8317685e925972f0f145b glibc-20070515T2025.tar.bz2
626a3d9974736400054a20355c2014c2 glibc-fedora-20070515T2025.tar.bz2 ad50ecf4f3e877558e03d1df1259c4d0 glibc-fedora-20070515T2025.tar.bz2