[Commits] r25240 - in /branches/eglibc-2_16: ./ libc/ libc/sysdeps/x86/fpu/bits/ ports/sysdeps/arm/bits/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Fri Feb  7 13:08:45 2014
New Revision: 25240

Log:
Merge changes between r25090 and r25239 from /fsf/glibc-2_16-branch.

Modified:
    branches/eglibc-2_16/   (props changed)
    branches/eglibc-2_16/libc/ChangeLog
    branches/eglibc-2_16/libc/NEWS
    branches/eglibc-2_16/libc/sysdeps/x86/fpu/bits/mathinline.h
    branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h   (props changed)

Propchange: branches/eglibc-2_16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  7 13:08:45 2014
@@ -1,2 +1,2 @@
-/fsf/glibc-2_16-branch:19382-25090
+/fsf/glibc-2_16-branch:19382-25239
 /fsf/trunk:15224-19381

Modified: branches/eglibc-2_16/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_16/libc/ChangeLog (original)
+++ branches/eglibc-2_16/libc/ChangeLog Fri Feb  7 13:08:45 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_16/libc/NEWS
==============================================================================
--- branches/eglibc-2_16/libc/NEWS (original)
+++ branches/eglibc-2_16/libc/NEWS Fri Feb  7 13:08:45 2014
@@ -9,7 +9,8 @@
 
 * The following bugs are resolved with this release:
 
-  6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14831, 15073
+  6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14831, 15073,
+  16510.
 
 Version 2.16
 

Modified: branches/eglibc-2_16/libc/sysdeps/x86/fpu/bits/mathinline.h
==============================================================================
--- branches/eglibc-2_16/libc/sysdeps/x86/fpu/bits/mathinline.h (original)
+++ branches/eglibc-2_16/libc/sysdeps/x86/fpu/bits/mathinline.h Fri Feb  7 13:08:45 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__ */

Propchange: branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  7 13:08:45 2014
@@ -1,3 +1,3 @@
-/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-25090
+/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-25239
 /fsf/trunk/ports/sysdeps/arm/bits/predefs.h:18166-19381
 /fsf/trunk/ports/sysdeps/arm/eabi/bits/predefs.h:15224-17813

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