fork/rust

git clone https://git.julia.blue/fork/rust

borsAuto merge of #71365 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum4fb7144ed15

1.43.0
2.7 KiB63 linesraw
1From 2739047682590b1df473401b4febf424f857fccf Mon Sep 17 00:00:00 2001
2From: Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
3Date: Sun, 17 Apr 2011 20:43:59 -0400
4Subject: [PATCH] Use .machine to prevent AS from complaining about z9-109
5 instructions in iconv modules
6
7---
8 sysdeps/s390/s390-64/utf16-utf32-z9.c | 5 ++++-
9 sysdeps/s390/s390-64/utf8-utf16-z9.c  | 5 ++++-
10 sysdeps/s390/s390-64/utf8-utf32-z9.c  | 5 ++++-
11 3 files changed, 12 insertions(+), 3 deletions(-)
12
13diff --git a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-utf32-z9.c
14index 14daf2118fe5..5bcaaaedec9c 100644
15--- a/sysdeps/s390/s390-64/utf16-utf32-z9.c
16+++ b/sysdeps/s390/s390-64/utf16-utf32-z9.c
17@@ -169,7 +169,10 @@ gconv_end (struct __gconv_step *data)
18     register unsigned long long outlen asm("11") = outend - outptr;	\
19     uint64_t cc = 0;							\
20 									\
21-    asm volatile ("0: " INSTRUCTION "  \n\t"				\
22+    asm volatile (".machine push       \n\t"				\
23+                  ".machine \"z9-109\" \n\t"				\
24+		  "0: " INSTRUCTION "  \n\t"				\
25+                  ".machine pop        \n\t"				\
26                   "   jo     0b        \n\t"				\
27 		  "   ipm    %2        \n"			        \
28 		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
29diff --git a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-utf16-z9.c
30index 5f73f3c59e21..812a42fae44c 100644
31--- a/sysdeps/s390/s390-64/utf8-utf16-z9.c
32+++ b/sysdeps/s390/s390-64/utf8-utf16-z9.c
33@@ -151,7 +151,10 @@ gconv_end (struct __gconv_step *data)
34     register unsigned long long outlen asm("11") = outend - outptr;	\
35     uint64_t cc = 0;							\
36 									\
37-    asm volatile ("0: " INSTRUCTION "  \n\t"				\
38+    asm volatile (".machine push       \n\t"				\
39+                  ".machine \"z9-109\" \n\t"				\
40+		  "0: " INSTRUCTION "  \n\t"				\
41+                  ".machine pop        \n\t"				\
42                   "   jo     0b        \n\t"				\
43 		  "   ipm    %2        \n"			        \
44 		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
45diff --git a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf32-z9.c
46index 17ef8bc890c3..0ffd848c8124 100644
47--- a/sysdeps/s390/s390-64/utf8-utf32-z9.c
48+++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c
49@@ -155,7 +155,10 @@ gconv_end (struct __gconv_step *data)
50     register unsigned long long outlen asm("11") = outend - outptr;	\
51     uint64_t cc = 0;							\
52 									\
53-    asm volatile ("0: " INSTRUCTION "  \n\t"				\
54+    asm volatile (".machine push       \n\t"				\
55+                  ".machine \"z9-109\" \n\t"				\
56+		  "0: " INSTRUCTION "  \n\t"				\
57+                  ".machine pop        \n\t"				\
58                   "   jo     0b        \n\t"				\
59 		  "   ipm    %2        \n"				\
60 		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
61-- 
622.9.3
63