Revert "Use .machine to prevent AS from complaining about z9-109 instructions in...

This reverts commit 2739047682590b1df473401b4febf424f857fccf.

diff --git a/ChangeLog b/ChangeLog
index 3ed77d05ab61aca094988181262e0cec0e25cf4a..90590d9a78088a8e8154f6a1afb3809c52f069f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -684,13 +684,6 @@
        * stdlib/bug-getcontext.c: New file.
        * stdlib/Makefile: Add rules to build and run bug-getcontext.
 
-2011-04-13  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
-
-       * sysdeps/s390/s390-64/utf16-utf32-z9.c: Wrap the z9-109
-       instructions into .machine "z9-109".
-       * sysdeps/s390/s390-64/utf8-utf16-z9.c: Likewise.
-       * sysdeps/s390/s390-64/utf8-utf32-z9.c: Likewise.
-
 2011-04-11  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
        * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes

diff --git a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-utf32-z9.c
index 5bcaaaedec9c9605095516d2f975d2ff192ecb55..14daf2118fe54b8c26c6daa358a26ac5cf9a031e 100644 (file)
--- a/sysdeps/s390/s390-64/utf16-utf32-z9.c
+++ b/sysdeps/s390/s390-64/utf16-utf32-z9.c
@@ -169,10 +169,7 @@ gconv_end (struct __gconv_step *data)
     register unsigned long long outlen asm("11") = outend - outptr;    \
     uint64_t cc = 0;                                                   \
                                                                        \
-    asm volatile (".machine push       \n\t"                           \
-                  ".machine \"z9-109\" \n\t"                           \
-                 "0: " INSTRUCTION "  \n\t"                            \
-                  ".machine pop        \n\t"                           \
+    asm volatile ("0: " INSTRUCTION "  \n\t"                           \
                   "   jo     0b        \n\t"                           \
                  "   ipm    %2        \n"                              \
                  : "+a" (pOutput), "+a" (pInput), "+d" (cc),           \

diff --git a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-utf16-z9.c
index 812a42fae44ce1fd4c587e2f5d8bb0faaaf55848..5f73f3c59e21084dbaca9e89b225bfbc29b4bca1 100644 (file)
--- a/sysdeps/s390/s390-64/utf8-utf16-z9.c
+++ b/sysdeps/s390/s390-64/utf8-utf16-z9.c
@@ -151,10 +151,7 @@ gconv_end (struct __gconv_step *data)
     register unsigned long long outlen asm("11") = outend - outptr;    \
     uint64_t cc = 0;                                                   \
                                                                        \
-    asm volatile (".machine push       \n\t"                           \
-                  ".machine \"z9-109\" \n\t"                           \
-                 "0: " INSTRUCTION "  \n\t"                            \
-                  ".machine pop        \n\t"                           \
+    asm volatile ("0: " INSTRUCTION "  \n\t"                           \
                   "   jo     0b        \n\t"                           \
                  "   ipm    %2        \n"                              \
                  : "+a" (pOutput), "+a" (pInput), "+d" (cc),           \

diff --git a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf32-z9.c
index 0ffd848c81246caa389e3bd749b0eb5590684836..17ef8bc890c39e5b383fe99826cc1a05c0cccecc 100644 (file)
--- a/sysdeps/s390/s390-64/utf8-utf32-z9.c
+++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c
@@ -155,10 +155,7 @@ gconv_end (struct __gconv_step *data)
     register unsigned long long outlen asm("11") = outend - outptr;    \
     uint64_t cc = 0;                                                   \
                                                                        \
-    asm volatile (".machine push       \n\t"                           \
-                  ".machine \"z9-109\" \n\t"                           \
-                 "0: " INSTRUCTION "  \n\t"                            \
-                  ".machine pop        \n\t"                           \
+    asm volatile ("0: " INSTRUCTION "  \n\t"                           \
                   "   jo     0b        \n\t"                           \
                  "   ipm    %2        \n"                              \
                  : "+a" (pOutput), "+a" (pInput), "+d" (cc),           \