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

[joseph@xxxxxxxxxx]

Author: joseph
Date: Fri Feb  7 13:07:28 2014
New Revision: 25239

Log:
Merge changes between r25089 and r25238 from /fsf/glibc-2_17-branch.

Modified:
    branches/eglibc-2_17/   (props changed)
    branches/eglibc-2_17/libc/ChangeLog
    branches/eglibc-2_17/libc/NEWS
    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/sysdeps/x86/fpu/bits/mathinline.h

Propchange: branches/eglibc-2_17/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  7 13:07:28 2014
@@ -1,2 +1,2 @@
-/fsf/glibc-2_17-branch:22054-25089
+/fsf/glibc-2_17-branch:22054-25238
 /fsf/trunk:15224-22029

Modified: branches/eglibc-2_17/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_17/libc/ChangeLog (original)
+++ branches/eglibc-2_17/libc/ChangeLog Fri Feb  7 13:07:28 2014
@@ -1,3 +1,9 @@
+2014-01-29  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #16510]
+	* sysdeps/x86/fpu/bits/mathinline.h: Check __SSE2_MATH__ instead
+	of __x86_64__ when disabling x87 inline functions.
+
 2014-01-04  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxx>
 	    OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
 

Modified: branches/eglibc-2_17/libc/NEWS
==============================================================================
--- branches/eglibc-2_17/libc/NEWS (original)
+++ branches/eglibc-2_17/libc/NEWS Fri Feb  7 13:07:28 2014
@@ -8,7 +8,7 @@
 Version 2.17.1
 
 * The following bugs are resolved with this release:
-  15003, 15006, 15073, 15122, 15759.
+  15003, 15006, 15073, 15122, 15759, 16510.
 
 
 Version 2.17

Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  7 13:07:28 2014
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:22054-25089
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:22054-25238
 /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 Fri Feb  7 13:07:28 2014
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:22054-25089
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:22054-25238
 /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 Fri Feb  7 13:07:28 2014
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:22054-25089
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:22054-25238
 /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 Fri Feb  7 13:07:28 2014
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:22054-25089
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:22054-25238
 /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/sysdeps/x86/fpu/bits/mathinline.h
==============================================================================
--- branches/eglibc-2_17/libc/sysdeps/x86/fpu/bits/mathinline.h (original)
+++ branches/eglibc-2_17/libc/sysdeps/x86/fpu/bits/mathinline.h Fri Feb  7 13:07:28 2014
@@ -1,5 +1,5 @@
 /* Inline math functions for i387 and SSE.
-   Copyright (C) 1995-2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -382,7 +382,7 @@
 # endif
 #endif
 
-#ifndef __x86_64__
+#ifndef __SSE2_MATH__
 # if ((!defined __NO_MATH_INLINES || defined __LIBC_INTERNAL_MATH_INLINES) \
      && defined __OPTIMIZE__)
 
@@ -965,4 +965,4 @@
 		    return __value;)
 # endif
 
-#endif /* !__x86_64__ */
+#endif /* !__SSE2_MATH__ */

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