about summary refs log tree commit diff
path: root/sysdeps/s390/s390-64/__longjmp.c
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/s390-64/__longjmp.c
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/s390-64/__longjmp.c')
-rw-r--r--sysdeps/s390/s390-64/__longjmp.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/sysdeps/s390/s390-64/__longjmp.c b/sysdeps/s390/s390-64/__longjmp.c
index e75e648a32..e962195c83 100644
--- a/sysdeps/s390/s390-64/__longjmp.c
+++ b/sysdeps/s390/s390-64/__longjmp.c
@@ -37,52 +37,52 @@ __longjmp (__jmp_buf env, int val)
 #elif defined CHECK_SP
   CHECK_SP (env, 0);
 #endif
-  register long int r2 __asm ("%r2") = val == 0 ? 1 : val;
+  register long int r2 __asm__ ("%r2") = val == 0 ? 1 : val;
 #ifdef PTR_DEMANGLE
-  register uintptr_t r3 __asm ("%r3") = guard;
-  register void *r1 __asm ("%r1") = (void *) env;
+  register uintptr_t r3 __asm__ ("%r3") = guard;
+  register void *r1 __asm__ ("%r1") = (void *) env;
 #endif
   /* Restore registers and jump back.  */
-  asm volatile (
-		/* longjmp probe expects longjmp first argument, second
-		   argument and target address.  */
+  __asm__ __volatile__ (
+			/* longjmp probe expects longjmp first argument, second
+			   argument and target address.  */
 #ifdef PTR_DEMANGLE
-		"lmg  %%r4,%%r5,64(%1)\n\t"
-		"xgr  %%r4,%2\n\t"
-		"xgr  %%r5,%2\n\t"
-		LIBC_PROBE_ASM (longjmp, 8@%1 -4@%0 8@%%r4)
+			"lmg  %%r4,%%r5,64(%1)\n\t"
+			"xgr  %%r4,%2\n\t"
+			"xgr  %%r5,%2\n\t"
+			LIBC_PROBE_ASM (longjmp, 8@%1 -4@%0 8@%%r4)
 #else
-		LIBC_PROBE_ASM (longjmp, 8@%1 -4@%0 8@%%r14)
+			LIBC_PROBE_ASM (longjmp, 8@%1 -4@%0 8@%%r14)
 #endif
 
-		/* restore fpregs  */
-		"ld    %%f8,80(%1)\n\t"
-		"ld    %%f9,88(%1)\n\t"
-		"ld    %%f10,96(%1)\n\t"
-		"ld    %%f11,104(%1)\n\t"
-		"ld    %%f12,112(%1)\n\t"
-		"ld    %%f13,120(%1)\n\t"
-		"ld    %%f14,128(%1)\n\t"
-		"ld    %%f15,136(%1)\n\t"
+			/* restore fpregs  */
+			"ld    %%f8,80(%1)\n\t"
+			"ld    %%f9,88(%1)\n\t"
+			"ld    %%f10,96(%1)\n\t"
+			"ld    %%f11,104(%1)\n\t"
+			"ld    %%f12,112(%1)\n\t"
+			"ld    %%f13,120(%1)\n\t"
+			"ld    %%f14,128(%1)\n\t"
+			"ld    %%f15,136(%1)\n\t"
 
-		/* restore gregs and return to jmp_buf target  */
+			/* restore gregs and return to jmp_buf target  */
 #ifdef PTR_DEMANGLE
-		"lmg  %%r6,%%r13,0(%1)\n\t"
-		"lgr  %%r15,%%r5\n\t"
-		LIBC_PROBE_ASM (longjmp_target, 8@%1 -4@%0 8@%%r4)
-		"br   %%r4"
+			"lmg  %%r6,%%r13,0(%1)\n\t"
+			"lgr  %%r15,%%r5\n\t"
+			LIBC_PROBE_ASM (longjmp_target, 8@%1 -4@%0 8@%%r4)
+			"br   %%r4"
 #else
-		"lmg  %%r6,%%r15,0(%1)\n\t"
-		LIBC_PROBE_ASM (longjmp_target, 8@%1 -4@%0 8@%%r14)
-		"br   %%r14"
+			"lmg  %%r6,%%r15,0(%1)\n\t"
+			LIBC_PROBE_ASM (longjmp_target, 8@%1 -4@%0 8@%%r14)
+			"br   %%r14"
 #endif
-		: : "r" (r2),
+			: : "r" (r2),
 #ifdef PTR_DEMANGLE
-		    "r" (r1), "r" (r3)
+			  "r" (r1), "r" (r3)
 #else
-		    "a" (env)
+			  "a" (env)
 #endif
-		);
+			);
 
   /* Avoid `volatile function does return' warnings.  */
   for (;;);