ce426f
From a6e4fa635fea4576c65747cc4b9e3a1fe9c9911f Mon Sep 17 00:00:00 2001
ce426f
From: Stefan Liebler <stli@linux.vnet.ibm.com>
ce426f
Date: Mon, 7 Nov 2016 16:12:24 +0100
ce426f
Subject: [PATCH 08/17] S390: Use __asm__ instead of asm.
ce426f
ce426f
upstream commit 31cf39421bae23ffc7b6c6a229e14f8faa41608f
ce426f
ce426f
This part is a prerequirement for the s390 iconv patches.
ce426f
---
ce426f
 sysdeps/s390/s390-64/utf16-utf32-z9.c | 28 ++++++++++++++--------------
ce426f
 sysdeps/s390/s390-64/utf8-utf16-z9.c  | 28 ++++++++++++++--------------
ce426f
 sysdeps/s390/s390-64/utf8-utf32-z9.c  | 28 ++++++++++++++--------------
ce426f
 3 files changed, 42 insertions(+), 42 deletions(-)
ce426f
ce426f
diff --git a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-utf32-z9.c
ce426f
index ddc42fe..e6a033d 100644
ce426f
--- a/sysdeps/s390/s390-64/utf16-utf32-z9.c
ce426f
+++ b/sysdeps/s390/s390-64/utf16-utf32-z9.c
ce426f
@@ -163,22 +163,22 @@ gconv_end (struct __gconv_step *data)
ce426f
    directions.  */
ce426f
 #define HARDWARE_CONVERT(INSTRUCTION)					\
ce426f
   {									\
ce426f
-    register const unsigned char* pInput asm ("8") = inptr;		\
ce426f
-    register unsigned long long inlen asm ("9") = inend - inptr;	\
ce426f
-    register unsigned char* pOutput asm ("10") = outptr;		\
ce426f
-    register unsigned long long outlen asm("11") = outend - outptr;	\
ce426f
+    register const unsigned char* pInput __asm__ ("8") = inptr;		\
ce426f
+    register unsigned long long inlen __asm__ ("9") = inend - inptr;	\
ce426f
+    register unsigned char* pOutput __asm__ ("10") = outptr;		\
ce426f
+    register unsigned long long outlen __asm__("11") = outend - outptr;	\
ce426f
     uint64_t cc = 0;							\
ce426f
 									\
ce426f
-    asm volatile (".machine push       \n\t"				\
ce426f
-                  ".machine \"z9-109\" \n\t"				\
ce426f
-		  "0: " INSTRUCTION "  \n\t"				\
ce426f
-                  ".machine pop        \n\t"				\
ce426f
-                  "   jo     0b        \n\t"				\
ce426f
-		  "   ipm    %2        \n"			        \
ce426f
-		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
ce426f
-		    "+d" (outlen), "+d" (inlen)				\
ce426f
-		  :							\
ce426f
-		  : "cc", "memory");					\
ce426f
+    __asm__ volatile (".machine push       \n\t"			\
ce426f
+		      ".machine \"z9-109\" \n\t"			\
ce426f
+		      "0: " INSTRUCTION "  \n\t"			\
ce426f
+		      ".machine pop        \n\t"			\
ce426f
+		      "   jo     0b        \n\t"			\
ce426f
+		      "   ipm    %2        \n"				\
ce426f
+		      : "+a" (pOutput), "+a" (pInput), "+d" (cc),	\
ce426f
+		      "+d" (outlen), "+d" (inlen)			\
ce426f
+		      :							\
ce426f
+		      : "cc", "memory");				\
ce426f
 									\
ce426f
     inptr = pInput;							\
ce426f
     outptr = pOutput;							\
ce426f
diff --git a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-utf16-z9.c
ce426f
index 2c2d92c..6dad1c2 100644
ce426f
--- a/sysdeps/s390/s390-64/utf8-utf16-z9.c
ce426f
+++ b/sysdeps/s390/s390-64/utf8-utf16-z9.c
ce426f
@@ -145,22 +145,22 @@ gconv_end (struct __gconv_step *data)
ce426f
    directions.  */
ce426f
 #define HARDWARE_CONVERT(INSTRUCTION)					\
ce426f
   {									\
ce426f
-    register const unsigned char* pInput asm ("8") = inptr;		\
ce426f
-    register unsigned long long inlen asm ("9") = inend - inptr;	\
ce426f
-    register unsigned char* pOutput asm ("10") = outptr;		\
ce426f
-    register unsigned long long outlen asm("11") = outend - outptr;	\
ce426f
+    register const unsigned char* pInput __asm__ ("8") = inptr;		\
ce426f
+    register unsigned long long inlen __asm__ ("9") = inend - inptr;	\
ce426f
+    register unsigned char* pOutput __asm__ ("10") = outptr;		\
ce426f
+    register unsigned long long outlen __asm__("11") = outend - outptr;	\
ce426f
     uint64_t cc = 0;							\
ce426f
 									\
ce426f
-    asm volatile (".machine push       \n\t"				\
ce426f
-                  ".machine \"z9-109\" \n\t"				\
ce426f
-		  "0: " INSTRUCTION "  \n\t"				\
ce426f
-                  ".machine pop        \n\t"				\
ce426f
-                  "   jo     0b        \n\t"				\
ce426f
-		  "   ipm    %2        \n"			        \
ce426f
-		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
ce426f
-		    "+d" (outlen), "+d" (inlen)				\
ce426f
-		  :							\
ce426f
-		  : "cc", "memory");					\
ce426f
+    __asm__ volatile (".machine push       \n\t"			\
ce426f
+		      ".machine \"z9-109\" \n\t"			\
ce426f
+		      "0: " INSTRUCTION "  \n\t"			\
ce426f
+		      ".machine pop        \n\t"			\
ce426f
+		      "   jo     0b        \n\t"			\
ce426f
+		      "   ipm    %2        \n"				\
ce426f
+		      : "+a" (pOutput), "+a" (pInput), "+d" (cc),	\
ce426f
+			"+d" (outlen), "+d" (inlen)			\
ce426f
+		      :							\
ce426f
+		      : "cc", "memory");				\
ce426f
 									\
ce426f
     inptr = pInput;							\
ce426f
     outptr = pOutput;							\
ce426f
diff --git a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf32-z9.c
ce426f
index c582155..721279e 100644
ce426f
--- a/sysdeps/s390/s390-64/utf8-utf32-z9.c
ce426f
+++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c
ce426f
@@ -149,22 +149,22 @@ gconv_end (struct __gconv_step *data)
ce426f
    directions.  */
ce426f
 #define HARDWARE_CONVERT(INSTRUCTION)					\
ce426f
   {									\
ce426f
-    register const unsigned char* pInput asm ("8") = inptr;		\
ce426f
-    register unsigned long long inlen asm ("9") = inend - inptr;	\
ce426f
-    register unsigned char* pOutput asm ("10") = outptr;		\
ce426f
-    register unsigned long long outlen asm("11") = outend - outptr;	\
ce426f
+    register const unsigned char* pInput __asm__ ("8") = inptr;		\
ce426f
+    register unsigned long long inlen __asm__ ("9") = inend - inptr;	\
ce426f
+    register unsigned char* pOutput __asm__ ("10") = outptr;		\
ce426f
+    register unsigned long long outlen __asm__("11") = outend - outptr;	\
ce426f
     uint64_t cc = 0;							\
ce426f
 									\
ce426f
-    asm volatile (".machine push       \n\t"				\
ce426f
-                  ".machine \"z9-109\" \n\t"				\
ce426f
-		  "0: " INSTRUCTION "  \n\t"				\
ce426f
-                  ".machine pop        \n\t"				\
ce426f
-                  "   jo     0b        \n\t"				\
ce426f
-		  "   ipm    %2        \n"				\
ce426f
-		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
ce426f
-		    "+d" (outlen), "+d" (inlen)				\
ce426f
-		  :							\
ce426f
-		  : "cc", "memory");					\
ce426f
+    __asm__ volatile (".machine push       \n\t"			\
ce426f
+		      ".machine \"z9-109\" \n\t"			\
ce426f
+		      "0: " INSTRUCTION "  \n\t"			\
ce426f
+		      ".machine pop        \n\t"			\
ce426f
+		      "   jo     0b        \n\t"			\
ce426f
+		      "   ipm    %2        \n"				\
ce426f
+		      : "+a" (pOutput), "+a" (pInput), "+d" (cc),	\
ce426f
+		      "+d" (outlen), "+d" (inlen)			\
ce426f
+		      :							\
ce426f
+		      : "cc", "memory");				\
ce426f
 									\
ce426f
     inptr = pInput;							\
ce426f
     outptr = pOutput;							\
ce426f
-- 
ce426f
1.8.3.1
ce426f