[commits] r15470 - in /fsf/trunk/libc: ChangeLog sysdeps/x86_64/fpu/bits/mathinline.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Sep 27 00:02:25 2011
New Revision: 15470

Log:
Import glibc-mainline for 2011-09-27

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Sep 27 00:02:25 2011
@@ -1,3 +1,7 @@
+2011-09-26  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/x86_64/fpu/bits/mathinline.h: Use __asm instead of asm.
+
 2011-09-21  Chung-Lin Tang  <cltang@xxxxxxxxxxxxxxxx>
 	    Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
 	    Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h Tue Sep 27 00:02:25 2011
@@ -73,7 +73,7 @@
 __NTH (lrintf (float __x))
 {
   long int __res;
-  asm ("cvtss2si %1, %0" : "=r" (__res) : "xm" (__x));
+  __asm ("cvtss2si %1, %0" : "=r" (__res) : "xm" (__x));
   return __res;
 }
 #  endif
@@ -82,7 +82,7 @@
 __NTH (lrint (double __x))
 {
   long int __res;
-  asm ("cvtsd2si %1, %0" : "=r" (__res) : "xm" (__x));
+  __asm ("cvtsd2si %1, %0" : "=r" (__res) : "xm" (__x));
   return __res;
 }
 #  endif
@@ -91,14 +91,14 @@
 __NTH (llrintf (float __x))
 {
   long long int __res;
-  asm ("cvtss2si %1, %0" : "=r" (__res) : "xm" (__x));
+  __asm ("cvtss2si %1, %0" : "=r" (__res) : "xm" (__x));
   return __res;
 }
 __MATH_INLINE long long int
 __NTH (llrint (double __x))
 {
   long long int __res;
-  asm ("cvtsd2si %1, %0" : "=r" (__res) : "xm" (__x));
+  __asm ("cvtsd2si %1, %0" : "=r" (__res) : "xm" (__x));
   return __res;
 }
 #  endif
@@ -108,13 +108,13 @@
 __MATH_INLINE float
 __NTH (fmaxf (float __x, float __y))
 {
-  asm ("maxss %1, %0" : "+x" (__x) : "xm" (__y));
+  __asm ("maxss %1, %0" : "+x" (__x) : "xm" (__y));
   return __x;
 }
 __MATH_INLINE double
 __NTH (fmax (double __x, double __y))
 {
-  asm ("maxsd %1, %0" : "+x" (__x) : "xm" (__y));
+  __asm ("maxsd %1, %0" : "+x" (__x) : "xm" (__y));
   return __x;
 }
 
@@ -122,13 +122,13 @@
 __MATH_INLINE float
 __NTH (fminf (float __x, float __y))
 {
-  asm ("minss %1, %0" : "+x" (__x) : "xm" (__y));
+  __asm ("minss %1, %0" : "+x" (__x) : "xm" (__y));
   return __x;
 }
 __MATH_INLINE double
 __NTH (fmin (double __x, double __y))
 {
-  asm ("minsd %1, %0" : "+x" (__x) : "xm" (__y));
+  __asm ("minsd %1, %0" : "+x" (__x) : "xm" (__y));
   return __x;
 }
 #  endif