summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-11-13 22:19:33 +0000
committerJakub Jelinek <jakub@redhat.com>2008-11-13 22:19:33 +0000
commit033b8b2d4de5cd8abe4278cd2b30c50d7a78e886 (patch)
tree8a50d72fd135568a2c28a3c1d91798995dd822fb
parent03c8e287448a12c8c4c6db3570f5b7e3930d488d (diff)
Updated to fedora-glibc-20081113T2206cvs/fedora-glibc-2_9-1
-rw-r--r--ChangeLog10
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in6
-rw-r--r--include/features.h2
-rw-r--r--sysdeps/unix/sysv/linux/bits/sched.h4
-rw-r--r--version.h4
6 files changed, 22 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index f9577c9140..60359025a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-13 Ulrich Drepper <drepper@redhat.com>
+
+ * version.h: Bump for 2.9 release.
+ * include/features.h (__GLIBC_MINOR__): Bump to 9.
+
+ [BZ #7029]
+ * sysdeps/unix/sysv/linux/bits/sched.h (__CPU_ALLOC_SIZE):
+ Multiply with sizeof of __cpu_mask, not 8 unconditionally after
+ all the rounding.
+
2008-11-11 Ulrich Drepper <drepper@redhat.com>
[BZ #7009]
diff --git a/fedora/branch.mk b/fedora/branch.mk
index a7dac68fcf..62e859b8fc 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-f8
-fedora-sync-date := 2008-11-12 20:08 UTC
-fedora-sync-tag := fedora-glibc-20081112T2008
+fedora-sync-date := 2008-11-13 22:06 UTC
+fedora-sync-tag := fedora-glibc-20081113T2206
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 08e3f9e597..f92087eb02 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -19,7 +19,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: @glibcversion@
-Release: 17
+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
@@ -984,6 +984,10 @@ rm -f *.filelist*
%endif
%changelog
+* Thu Nov 13 2008 Jakub Jelinek <jakub@redhat.com> 2.9-1
+- glibc 2.9 release
+- fix CPU_ALLOC_SIZE on 32-bit arches (BZ#7029)
+
* Wed Nov 12 2008 Jakub Jelinek <jakub@redhat.com> 2.8.90-17
- update from trunk
- don't abort on broken DNS replies (#469299, BZ#7009)
diff --git a/include/features.h b/include/features.h
index 18093befcf..69df5df36b 100644
--- a/include/features.h
+++ b/include/features.h
@@ -316,7 +316,7 @@
/* Major and minor version number of the GNU C library package. Use
these macros to test for features in specific releases. */
#define __GLIBC__ 2
-#define __GLIBC_MINOR__ 8
+#define __GLIBC_MINOR__ 9
#define __GLIBC_PREREQ(maj, min) \
((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
diff --git a/sysdeps/unix/sysv/linux/bits/sched.h b/sysdeps/unix/sysv/linux/bits/sched.h
index 38ba305006..8f694d70c4 100644
--- a/sysdeps/unix/sysv/linux/bits/sched.h
+++ b/sysdeps/unix/sysv/linux/bits/sched.h
@@ -1,6 +1,6 @@
/* Definitions of constants and data structure for POSIX 1003.1b-1993
scheduling interface.
- Copyright (C) 1996-1999,2001-2003,2005,2006,2007
+ Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -184,7 +184,7 @@ typedef struct
__dest; }))
# define __CPU_ALLOC_SIZE(count) \
- ((((count) + __NCPUBITS - 1) / __NCPUBITS) * 8)
+ ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask))
# define __CPU_ALLOC(count) __sched_cpualloc (count)
# define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
diff --git a/version.h b/version.h
index 4bb7ab359c..57fd137801 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
/* This file just defines the current version number of libc. */
-#define RELEASE "development"
-#define VERSION "2.8.90"
+#define RELEASE "stable"
+#define VERSION "2.9"