diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 20:01:19 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 20:01:19 +0200 |
| commit | 3896c5809b49e72fbadc57da2189ff42aa2a5d02 (patch) | |
| tree | 976132226affe5ff11686d86d01d059aa5eabc6c /sysdeps/s390/s390-64/utf8-utf32-z9.c | |
| parent | 52c6cb0bba348bf5f25ff2a213e04c0f3fc378aa (diff) | |
| parent | 4dc1e6e42f1f602e1d2227e112f2db8dce9da763 (diff) | |
Merge commit 'refs/top-bases/t/hurdsig-boot-fix' into t/hurdsig-boot-fix
Diffstat (limited to 'sysdeps/s390/s390-64/utf8-utf32-z9.c')
| -rw-r--r-- | sysdeps/s390/s390-64/utf8-utf32-z9.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf32-z9.c index 9a74448285..defd47d251 100644 --- a/sysdeps/s390/s390-64/utf8-utf32-z9.c +++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c @@ -2,7 +2,7 @@ This module uses the Z9-109 variants of the Convert Unicode instructions. - Copyright (C) 1997-2015 Free Software Foundation, Inc. + Copyright (C) 1997-2016 Free Software Foundation, Inc. Author: Andreas Krebbel <Andreas.Krebbel@de.ibm.com> Based on the work by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -149,22 +149,22 @@ gconv_end (struct __gconv_step *data) directions. */ #define HARDWARE_CONVERT(INSTRUCTION) \ { \ - register const unsigned char* pInput asm ("8") = inptr; \ - register unsigned long long inlen asm ("9") = inend - inptr; \ - register unsigned char* pOutput asm ("10") = outptr; \ - register unsigned long long outlen asm("11") = outend - outptr; \ + register const unsigned char* pInput __asm__ ("8") = inptr; \ + register unsigned long long inlen __asm__ ("9") = inend - inptr; \ + register unsigned char* pOutput __asm__ ("10") = outptr; \ + 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" \ - " jo 0b \n\t" \ - " ipm %2 \n" \ - : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ - "+d" (outlen), "+d" (inlen) \ - : \ - : "cc", "memory"); \ + __asm__ volatile (".machine push \n\t" \ + ".machine \"z9-109\" \n\t" \ + "0: " INSTRUCTION " \n\t" \ + ".machine pop \n\t" \ + " jo 0b \n\t" \ + " ipm %2 \n" \ + : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ + "+d" (outlen), "+d" (inlen) \ + : \ + : "cc", "memory"); \ \ inptr = pInput; \ outptr = pOutput; \ |