[Commits] r22063 - in /trunk: ./ libc/ libc/include/ libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/ libc/ports/sysdep...

[joseph@xxxxxxxxxx]

Author: joseph
Date: Tue Dec 25 10:44:14 2012
New Revision: 22063

Log:
Merge changes between r22029 and r22062 from /fsf/trunk.

Modified:
    trunk/   (props changed)
    trunk/libc/ChangeLog
    trunk/libc/NEWS
    trunk/libc/include/features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data   (props changed)
    trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data   (props changed)
    trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data   (props changed)
    trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data   (props changed)
    trunk/libc/version.h

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 25 10:44:14 2012
@@ -1,1 +1,1 @@
-/fsf/trunk:15224-22029
+/fsf/trunk:15224-22062

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Tue Dec 25 10:44:14 2012
@@ -1,3 +1,9 @@
+2012-12-25  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* version.h (RELEASE): Set to "development".
+	(VERSION): Set to "2.17.90".
+	* NEWS: Add 2.18 section.
+
 2012-12-21  David S. Miller  <davem@xxxxxxxxxxxxx>
 
 	* po/hr.po: Update from translation team.

Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Tue Dec 25 10:44:14 2012
@@ -4,6 +4,11 @@
 
 Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
 using `glibc' in the "product" field.
+
+Version 2.18
+
+* The following bugs are resolved with this release:
+
 
 Version 2.17
 

Modified: trunk/libc/include/features.h
==============================================================================
--- trunk/libc/include/features.h (original)
+++ trunk/libc/include/features.h Tue Dec 25 10:44:14 2012
@@ -356,7 +356,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__	16
+#define	__GLIBC_MINOR__	17
 
 #define __GLIBC_PREREQ(maj, min) \
 	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))

Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 25 10:44:14 2012
@@ -1,2 +1,2 @@
 /fsf/trunk/libc/ports/data/c++-types-powerpce500v2-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:19921-22029
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:19921-22062

Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 25 10:44:14 2012
@@ -1,2 +1,2 @@
 /fsf/trunk/libc/ports/data/localplt-powerpce500v2-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:19921-22029
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:19921-22062

Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 25 10:44:14 2012
@@ -1,2 +1,2 @@
 /fsf/trunk/libc/ports/data/c++-types-powerpce500v1-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:19921-22029
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:19921-22062

Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 25 10:44:14 2012
@@ -1,2 +1,2 @@
 /fsf/trunk/libc/ports/data/localplt-powerpce500v1-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:19921-22029
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:19921-22062

Modified: trunk/libc/version.h
==============================================================================
--- trunk/libc/version.h (original)
+++ trunk/libc/version.h Tue Dec 25 10:44:14 2012
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "development"
-#define VERSION "2.16.90"
+#define VERSION "2.17.90"

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits