[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r22064 - in /branches/eglibc-2_17: ./ libc/ libc/include/ libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/ li...



Author: joseph
Date: Tue Dec 25 10:45:59 2012
New Revision: 22064

Log:
Merge changes between r22053 and r22063 from /fsf/glibc-2_17-branch.

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

Propchange: branches/eglibc-2_17/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 25 10:45:59 2012
@@ -1,1 +1,2 @@
+/fsf/glibc-2_17-branch:22054-22063
 /fsf/trunk:15224-22029

Modified: branches/eglibc-2_17/libc/include/features.h
==============================================================================
--- branches/eglibc-2_17/libc/include/features.h (original)
+++ branches/eglibc-2_17/libc/include/features.h Tue Dec 25 10:45:59 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: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 25 10:45:59 2012
@@ -1,2 +1,3 @@
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:22054-22063
 /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

Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 25 10:45:59 2012
@@ -1,2 +1,3 @@
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:22054-22063
 /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

Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 25 10:45:59 2012
@@ -1,2 +1,3 @@
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:22054-22063
 /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

Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 25 10:45:59 2012
@@ -1,2 +1,3 @@
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:22054-22063
 /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

Modified: branches/eglibc-2_17/libc/version.h
==============================================================================
--- branches/eglibc-2_17/libc/version.h (original)
+++ branches/eglibc-2_17/libc/version.h Tue Dec 25 10:45:59 2012
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
-#define RELEASE "development"
-#define VERSION "2.16.90"
+#define RELEASE "stable"
+#define VERSION "2.17"

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