From 9581d701d8c3a966ee4a73a5221c257a1c1a1e58 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 6 Aug 2008 08:17:47 +0000 Subject: - some more asm keyword fixes (Yann E. MORIN) --- libc/sysdeps/linux/i386/bits/mathinline.h | 30 +++++++++++++++--------------- libc/sysdeps/linux/mips/sigaction.c | 3 +-- libc/sysdeps/linux/x86_64/sigaction.c | 5 ++--- 3 files changed, 18 insertions(+), 20 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/i386/bits/mathinline.h b/libc/sysdeps/linux/i386/bits/mathinline.h index 879b76b40..ca7277d76 100644 --- a/libc/sysdeps/linux/i386/bits/mathinline.h +++ b/libc/sysdeps/linux/i386/bits/mathinline.h @@ -299,12 +299,12 @@ __inline_mathcode (__pow2, __x, \ __extension__ long long int __p = (long long int) __x; \ if (__x == (long double) __p) \ { \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fscale" \ : "=t" (__value) : "0" (1.0), "u" (__x)); \ return __value; \ } \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fld %%st(0)\n\t" \ "frndint # int(x)\n\t" \ "fxch\n\t" \ @@ -312,7 +312,7 @@ __inline_mathcode (__pow2, __x, \ "f2xm1 # 2^(fract(x)) - 1\n\t" \ : "=t" (__value), "=u" (__exponent) : "0" (__x)); \ __value += 1.0; \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fscale" \ : "=t" (__value) : "0" (__value), "u" (__exponent)); \ return __value) @@ -321,7 +321,7 @@ __inline_mathcode (__pow2, __x, \ # define __sincos_code \ register long double __cosr; \ register long double __sinr; \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fsincos\n\t" \ "fnstsw %%ax\n\t" \ "testl $0x400, %%eax\n\t" \ @@ -373,7 +373,7 @@ __NTH (__sincosl (long double __x, long double *__sinx, long double *__cosx)) register long double __value; \ register long double __exponent; \ register long double __temp; \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fldl2e # e^x - 1 = 2^(x * log2(e)) - 1\n\t" \ "fmul %%st(1) # x * log2(e)\n\t" \ "fst %%st(1)\n\t" \ @@ -383,7 +383,7 @@ __NTH (__sincosl (long double __x, long double *__sinx, long double *__cosx)) "f2xm1 # 2^(fract(x * log2(e))) - 1\n\t" \ "fscale # 2^(x * log2(e)) - 2^(int(x * log2(e)))\n\t" \ : "=t" (__value), "=u" (__exponent) : "0" (__x)); \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fscale # 2^int(x * log2(e))\n\t" \ : "=t" (__temp) : "0" (1.0), "u" (__exponent)); \ __temp -= 1.0; \ @@ -398,7 +398,7 @@ __inline_mathcodeNP_ (long double, __expl, __x, return __builtin_expl (__x)) # define __exp_code \ register long double __value; \ register long double __exponent; \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fldl2e # e^x = 2^(x * log2(e))\n\t" \ "fmul %%st(1) # x * log2(e)\n\t" \ "fst %%st(1)\n\t" \ @@ -408,7 +408,7 @@ __inline_mathcodeNP_ (long double, __expl, __x, return __builtin_expl (__x)) "f2xm1 # 2^(fract(x * log2(e))) - 1\n\t" \ : "=t" (__value), "=u" (__exponent) : "0" (__x)); \ __value += 1.0; \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fscale" \ : "=t" (__value) : "0" (__value), "u" (__exponent)); \ return __value @@ -421,7 +421,7 @@ __inline_mathcodeNP_ (long double, __expl, __x, __exp_code) __inline_mathcodeNP (tan, __x, \ register long double __value; \ register long double __value2 __attribute__ ((__unused__)); \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fptan" \ : "=t" (__value2), "=u" (__value) : "0" (__x)); \ return __value) @@ -435,7 +435,7 @@ __inline_mathcodeNP2_ (long double, __atan2l, __y, __x, #else # define __atan2_code \ register long double __value; \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fpatan" \ : "=t" (__value) : "0" (__x), "u" (__y) : "st(1)"); \ return __value @@ -449,7 +449,7 @@ __inline_mathcodeNP2_ (long double, __atan2l, __y, __x, __atan2_code) #if defined __FAST_MATH__ && !__GNUC_PREREQ (3, 5) __inline_mathcodeNP2 (fmod, __x, __y, \ register long double __value; \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("1: fprem\n\t" \ "fnstsw %%ax\n\t" \ "sahf\n\t" \ @@ -552,7 +552,7 @@ __inline_mathcodeNP (ceil, __x, \ #ifdef __FAST_MATH__ # define __ldexp_code \ register long double __value; \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fscale" \ : "=t" (__value) : "0" (__x), "u" ((long double) __y)); \ return __value @@ -581,7 +581,7 @@ __inline_mathcodeNP (log1p, __x, \ if (__fabsl (__x) >= 1.0 - 0.5 * __M_SQRT2) \ __value = logl (1.0 + __x); \ else \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fldln2\n\t" \ "fxch\n\t" \ "fyl2xp1" \ @@ -611,7 +611,7 @@ __inline_mathcodeNP2 (hypot, __x, __y, __inline_mathcodeNP(logb, __x, \ register long double __value; \ register long double __junk; \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("fxtract\n\t" \ : "=t" (__junk), "=u" (__value) : "0" (__x)); \ return __value) @@ -699,7 +699,7 @@ __NTH (llrintl (long double __x)) __inline_mathcodeNP2 (drem, __x, __y, \ register double __value; \ register int __clobbered; \ - __asm __volatile__ \ + __asm__ __volatile__ \ ("1: fprem1\n\t" \ "fstsw %%ax\n\t" \ "sahf\n\t" \ diff --git a/libc/sysdeps/linux/mips/sigaction.c b/libc/sysdeps/linux/mips/sigaction.c index d03371f5a..39d38b86f 100644 --- a/libc/sysdeps/linux/mips/sigaction.c +++ b/libc/sysdeps/linux/mips/sigaction.c @@ -140,8 +140,7 @@ libc_hidden_weak(sigaction) #define RESTORE(name, syscall) RESTORE2 (name, syscall) #define RESTORE2(name, syscall) \ -asm \ - ( \ +__asm__ ( \ ".align 4\n" \ "__" #name ":\n" \ " li $2, " #syscall "\n" \ diff --git a/libc/sysdeps/linux/x86_64/sigaction.c b/libc/sysdeps/linux/x86_64/sigaction.c index 29b6ed03a..aa5c0d472 100644 --- a/libc/sysdeps/linux/x86_64/sigaction.c +++ b/libc/sysdeps/linux/x86_64/sigaction.c @@ -135,9 +135,8 @@ libc_hidden_weak(sigaction) #define RESTORE(name, syscall) RESTORE2 (name, syscall) # define RESTORE2(name, syscall) \ -asm \ - ( \ - ".text\n" \ +__asm__ ( \ + ".text\n" \ "__" #name ":\n" \ " movq $" #syscall ", %rax\n" \ " syscall\n" \ -- cgit v1.2.3