about summary refs log tree commit diff
path: root/sysdeps/s390/nptl
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.vnet.ibm.com>2015-11-20 08:56:40 +0100
committerAndreas Krebbel <krebbel@linux.vnet.ibm.com>2015-11-20 08:56:40 +0100
commit31cf39421bae23ffc7b6c6a229e14f8faa41608f (patch)
tree06c691d99784858f0ccd30133fed70f9362b91a5 /sysdeps/s390/nptl
parent9695cb3e6528d9f6f5c7c7f96bd6c94e5ba0e2c4 (diff)
downloadglibc-31cf39421bae23ffc7b6c6a229e14f8faa41608f.tar.gz
glibc-31cf39421bae23ffc7b6c6a229e14f8faa41608f.tar.xz
glibc-31cf39421bae23ffc7b6c6a229e14f8faa41608f.zip
S390: Use __asm__ instead of asm.
	* sysdeps/s390/fpu/bits/mathinline.h:
	Use __asm__ [__volatile__] instead of asm [volatile].
	* sysdeps/s390/abort-instr.h: Likewise.
	* sysdeps/s390/atomic-machine.h: Likewise.
	* sysdeps/s390/bits/string.h: Likewise.
	* sysdeps/s390/dl-tls.h: Likewise.
	* sysdeps/s390/fpu/e_sqrt.c: Likewise.
	* sysdeps/s390/fpu/e_sqrtf.c: Likewise.
	* sysdeps/s390/fpu/e_sqrtl.c: Likewise.
	* sysdeps/s390/fpu/fesetround.c: Likewise.
	* sysdeps/s390/fpu/fpu_control.h: Likewise.
	* sysdeps/s390/fpu/s_fma.c: Likewise.
	* sysdeps/s390/fpu/s_fmaf.c: Likewise.
	* sysdeps/s390/memusage.h: Likewise.
	* sysdeps/s390/multiarch/ifunc-resolve.h: Likewise.
	* sysdeps/s390/nptl/pthread_spin_lock.c: Likewise.
	* sysdeps/s390/nptl/pthread_spin_trylock.c: Likewise.
	* sysdeps/s390/nptl/pthread_spin_unlock.c: Likewise.
	* sysdeps/s390/nptl/tls.h: Likewise.
	* sysdeps/s390/s390-32/__longjmp.c: Likewise.
	* sysdeps/s390/s390-32/backtrace.c: Likewise.
	* sysdeps/s390/s390-32/dl-machine.h: Likewise.
	* sysdeps/s390/s390-32/multiarch/memcmp.c: Likewise.
	* sysdeps/s390/s390-32/stackguard-macros.h: Likewise.
	* sysdeps/s390/s390-32/tls-macros.h: Likewise.
	* sysdeps/s390/s390-64/__longjmp.c: Likewise.
	* sysdeps/s390/s390-64/backtrace.c: Likewise.
	* sysdeps/s390/s390-64/dl-machine.h: Likewise.
	* sysdeps/s390/s390-64/iso-8859-1_cp037_z900.c: Likewise.
	* sysdeps/s390/s390-64/multiarch/memcmp.c: Likewise.
	* sysdeps/s390/s390-64/stackguard-macros.h: Likewise.
	* sysdeps/s390/s390-64/tls-macros.h: Likewise.
	* sysdeps/s390/s390-64/utf16-utf32-z9.c: Likewise.
	* sysdeps/s390/s390-64/utf8-utf16-z9.c: Likewise.
	* sysdeps/s390/s390-64/utf8-utf32-z9.c: Likewise.
	* sysdeps/unix/sysv/linux/s390/brk.c: Likewise.
	* sysdeps/unix/sysv/linux/s390/elision-trylock.c: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise.
	* sysdeps/unix/sysv/linux/s390/sysconf.c: Likewise.
Diffstat (limited to 'sysdeps/s390/nptl')
-rw-r--r--sysdeps/s390/nptl/pthread_spin_lock.c10
-rw-r--r--sysdeps/s390/nptl/pthread_spin_trylock.c6
-rw-r--r--sysdeps/s390/nptl/pthread_spin_unlock.c6
-rw-r--r--sysdeps/s390/nptl/tls.h4
4 files changed, 13 insertions, 13 deletions
diff --git a/sysdeps/s390/nptl/pthread_spin_lock.c b/sysdeps/s390/nptl/pthread_spin_lock.c
index f6bca3de4d..a505affd2f 100644
--- a/sysdeps/s390/nptl/pthread_spin_lock.c
+++ b/sysdeps/s390/nptl/pthread_spin_lock.c
@@ -23,10 +23,10 @@ pthread_spin_lock (pthread_spinlock_t *lock)
 {
   int oldval;
 
-  __asm __volatile ("0: lhi %0,0\n"
-		    "   cs  %0,%2,%1\n"
-		    "   jl  0b"
-		    : "=&d" (oldval), "=Q" (*lock)
-		    : "d" (1), "m" (*lock) : "cc" );
+  __asm__ __volatile__ ("0: lhi %0,0\n"
+			"   cs  %0,%2,%1\n"
+			"   jl  0b"
+			: "=&d" (oldval), "=Q" (*lock)
+			: "d" (1), "m" (*lock) : "cc" );
   return 0;
 }
diff --git a/sysdeps/s390/nptl/pthread_spin_trylock.c b/sysdeps/s390/nptl/pthread_spin_trylock.c
index 210a2c6500..3bc0dedc7b 100644
--- a/sysdeps/s390/nptl/pthread_spin_trylock.c
+++ b/sysdeps/s390/nptl/pthread_spin_trylock.c
@@ -24,9 +24,9 @@ pthread_spin_trylock (pthread_spinlock_t *lock)
 {
   int old;
 
-  __asm __volatile ("cs %0,%3,%1"
-		    : "=d" (old), "=Q" (*lock)
-		    : "0" (0), "d" (1), "m" (*lock) : "cc" );
+  __asm__ __volatile__ ("cs %0,%3,%1"
+			: "=d" (old), "=Q" (*lock)
+			: "0" (0), "d" (1), "m" (*lock) : "cc" );
 
   return old != 0 ? EBUSY : 0;
 }
diff --git a/sysdeps/s390/nptl/pthread_spin_unlock.c b/sysdeps/s390/nptl/pthread_spin_unlock.c
index a34ebccdce..e3d8856bda 100644
--- a/sysdeps/s390/nptl/pthread_spin_unlock.c
+++ b/sysdeps/s390/nptl/pthread_spin_unlock.c
@@ -24,9 +24,9 @@
 int
 pthread_spin_unlock (pthread_spinlock_t *lock)
 {
-  __asm __volatile ("   xc  %O0(4,%R0),%0\n"
-		    "   bcr 15,0"
-		    : "=Q" (*lock) : "m" (*lock) : "cc" );
+  __asm__ __volatile__ ("   xc  %O0(4,%R0),%0\n"
+			"   bcr 15,0"
+			: "=Q" (*lock) : "m" (*lock) : "cc" );
   return 0;
 }
 strong_alias (pthread_spin_unlock, pthread_spin_init)
diff --git a/sysdeps/s390/nptl/tls.h b/sysdeps/s390/nptl/tls.h
index e6f8a47ecc..28a2119b15 100644
--- a/sysdeps/s390/nptl/tls.h
+++ b/sysdeps/s390/nptl/tls.h
@@ -159,9 +159,9 @@ typedef struct
 
 /* Set the stack guard field in TCB head.  */
 #define THREAD_SET_STACK_GUARD(value) \
-  do 									      \
+  do									      \
    {									      \
-     __asm __volatile ("" : : : "a0", "a1");				      \
+     __asm__ __volatile__ ("" : : : "a0", "a1");			      \
      THREAD_SETMEM (THREAD_SELF, header.stack_guard, value);		      \
    }									      \
   while (0)