Merge changes between r19350 and r19381 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@19382 7b3dc134-2b1b-0410-93df-9e9f96275f8d

5 files changed, 28 insertions, 9 deletions

diff --git a/libc/ChangeLog b/libc/ChangeLog
index e59ed6c9d..75dea027a 100644
--- a/libc/ChangeLog
+++ b/libc/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-30  Carlos O'Donell  <carlos_odonell@mentor.com>
+
+	* NEWS: Update copyright. Remove last-updated date.
+	Mention math library bug fixes and timezone data changes.
+	* README: Mention GNU/Hurd, x32, and HPPA support status.
+
 2012-06-28  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* manual/contrib.texi (Contributors): Sort alphabetically by last name.
diff --git a/libc/NEWS b/libc/NEWS
index a9500faeb..a90d95599 100644
--- a/libc/NEWS
+++ b/libc/NEWS
@@ -1,5 +1,5 @@
-GNU C Library NEWS -- history of user-visible changes.  2012-1-27
-Copyright (C) 1992-2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+GNU C Library NEWS -- history of user-visible changes.
+Copyright (C) 1992-2012 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send GNU C library bug reports via <http://sources.redhat.com/bugzilla/>
@@ -123,6 +123,17 @@ Version 2.16
   what x86-64 configurations install.  These same header files can be used
   for -m32, -m64, or -mx32 builds.
   Contributed by H.J. Lu.
+
+* Math library bug fixes.  A thorough audit of all open math library bugs was
+  conducted by Joseph Myers.  Significant progress was made on many math
+  library bugs resulting in more accurate exceptions and function results.
+  Many thanks to all those that contributed including Andreas Jaeger for his
+  patch review and work on the x87 trigonometric instruction issues.
+
+* Timezone data is no longer installed.  Timezone-related binaries and scripts
+  will continue to be installed.  Users should obtain their timezone data from
+  their distribution provider or from the tzdata package at
+  <ftp://munnari.oz.au/pub/>.
 
 Version 2.15
 
@@ -2087,7 +2098,7 @@ Version 1.04
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 1992-2012 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/libc/README b/libc/README
index a29595383..b6ab77067 100644
--- a/libc/README
+++ b/libc/README
@@ -40,7 +40,9 @@ implement the operating system behavior seen by user applications.
 In GNU/Hurd systems, it works with a microkernel and Hurd servers.
 
 The GNU C Library implements much of the POSIX.1 functionality in the
-GNU/Hurd system, using configurations i[34567]86-*-gnu.
+GNU/Hurd system, using configurations i[34567]86-*-gnu.  The current
+GNU/Hurd support requires out-of-tree patches that will eventually be
+incorporated into an official GNU C Library release.
 
 When working with Linux kernels, the GNU C Library version from
 version 2.4 on is intended primarily for use with Linux kernel version
@@ -62,7 +64,7 @@ installed for the pthread library to work correctly.
 The GNU C Library supports these configurations for using Linux kernels:
 
 	i[4567]86-*-linux-gnu
-	x86_64-*-linux-gnu
+	x86_64-*-linux-gnu	Can build either x86_64 or x32
 	powerpc-*-linux-gnu	Hardware floating point required
 	powerpc64-*-linux-gnu
 	s390-*-linux-gnu
@@ -80,7 +82,7 @@ Currently these configurations have code in the `ports' add-on:
 	alpha*-*-linux-gnu	Requires Linux 2.6.9 or newer for NPTL
 	am33*-*-linux-gnu	Not currently functional
 	arm-*-linux-gnueabi	Requires Linux 2.6.16-rc1 or newer for NPTL
-	hppa-*-linux-gnu	Requires Linux 2.6.9 or newer for NPTL
+	hppa-*-linux-gnu	Not currently functional without patches.
 	ia64-*-linux-gnu
 	m68k-*-linux-gnu
 	mips-*-linux-gnu	Requires Linux 2.6.12 or newer for NPTL
diff --git a/libc/include/features.h b/libc/include/features.h
index 798da1e76..10d29811a 100644
--- a/libc/include/features.h
+++ b/libc/include/features.h
@@ -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__	15
+#define	__GLIBC_MINOR__	16
 
 #define __GLIBC_PREREQ(maj, min) \
 	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
diff --git a/libc/version.h b/libc/version.h
index f400088b3..25ae4f7c1 100644
--- a/libc/version.h
+++ b/libc/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
-#define RELEASE "development"
-#define VERSION "2.15.90"
+#define RELEASE "stable"
+#define VERSION "2.16"