r4618 - in glibc-package/branches/eglibc-2.13/debian: . patches patches/s390
Author: aurel32
Date: 2011-05-01 14:27:19 +0000 (Sun, 01 May 2011)
New Revision: 4618
Added:
glibc-package/branches/eglibc-2.13/debian/patches/s390/cvs-iconv-z9-109.diff
Removed:
glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-iconv-z9-109.diff
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/patches/series
Log:
Replace patches/s390/submitted-iconv-z9-109.diff by upstream version
patches/s390/cvs-iconv-z9-109.diff
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-05-01 14:02:33 UTC (rev 4617)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-05-01 14:27:19 UTC (rev 4618)
@@ -134,8 +134,8 @@
submitted-fxstatat.patch to fix FTBFS on alpha.
* Add patches/any/local-linuxthreads-deps.diff to fix testsuite issues
on GNU/kFreeBSD.
- * Add patches/s390/submitted-iconv-z9-109.diff to fix FTBFS on s390
- with recent binutils.
+ * Add patches/s390/cvs-iconv-z9-109.diff to fix FTBFS on s390 with
+ recent binutils.
* Add patches/hppa/submitted-fcntl_h.diff, hppa/submitted-stackinfo.diff
and hppa/submitted-libm-hidden.diff to fix FTBFS on hppa.
* Add patches/alpha/submitted-____longjmp_chk.diff to fix longjmp() with
Added: glibc-package/branches/eglibc-2.13/debian/patches/s390/cvs-iconv-z9-109.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/s390/cvs-iconv-z9-109.diff (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/s390/cvs-iconv-z9-109.diff 2011-05-01 14:27:19 UTC (rev 4618)
@@ -0,0 +1,55 @@
+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.
+
+diff --git a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-utf32-z9.c
+index 14daf21..5bcaaae 100644
+--- a/sysdeps/s390/s390-64/utf16-utf32-z9.c
++++ b/sysdeps/s390/s390-64/utf16-utf32-z9.c
+@@ -169,7 +169,10 @@ gconv_end (struct __gconv_step *data)
+ register unsigned long long outlen asm("11") = outend - outptr; \
+ uint64_t cc = 0; \
+ \
+- asm volatile ("0: " INSTRUCTION " \n\t" \
++ 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), \
+diff --git a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-utf16-z9.c
+index 5f73f3c..812a42f 100644
+--- a/sysdeps/s390/s390-64/utf8-utf16-z9.c
++++ b/sysdeps/s390/s390-64/utf8-utf16-z9.c
+@@ -151,7 +151,10 @@ gconv_end (struct __gconv_step *data)
+ register unsigned long long outlen asm("11") = outend - outptr; \
+ uint64_t cc = 0; \
+ \
+- asm volatile ("0: " INSTRUCTION " \n\t" \
++ 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), \
+diff --git a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf32-z9.c
+index 17ef8bc..0ffd848 100644
+--- a/sysdeps/s390/s390-64/utf8-utf32-z9.c
++++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c
+@@ -155,7 +155,10 @@ gconv_end (struct __gconv_step *data)
+ register unsigned long long outlen asm("11") = outend - outptr; \
+ uint64_t cc = 0; \
+ \
+- asm volatile ("0: " INSTRUCTION " \n\t" \
++ 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), \
Deleted: glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-iconv-z9-109.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-iconv-z9-109.diff 2011-05-01 14:02:33 UTC (rev 4617)
+++ glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-iconv-z9-109.diff 2011-05-01 14:27:19 UTC (rev 4618)
@@ -1,26 +0,0 @@
-2011-03-01 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/s390/s390-64/Makefile(utf8-utf32-z9.c): pass
- -march=z9-109 to the assembler.
- (utf16-utf32-z9.c): Likewise.
- (utf8-utf16-z9.c): Likewise.
-
-diff --git a/sysdeps/s390/s390-64/Makefile b/sysdeps/s390/s390-64/Makefile
-index 1814f37..bb0b62c 100644
---- a/sysdeps/s390/s390-64/Makefile
-+++ b/sysdeps/s390/s390-64/Makefile
-@@ -16,12 +16,15 @@ ISO-8859-1_CP037_Z900-map := gconv.map
-
- UTF8_UTF32_Z9-routines := utf8-utf32-z9
- UTF8_UTF32_Z9-map := gconv.map
-+CFLAGS-utf8-utf32-z9.c += -Wa,-march=z9-109
-
- UTF16_UTF32_Z9-routines := utf16-utf32-z9
- UTF16_UTF32_Z9-map := gconv.map
-+CFLAGS-utf16-utf32-z9.c += -Wa,-march=z9-109
-
- UTF8_UTF16_Z9-routines := utf8-utf16-z9
- UTF8_UTF16_Z9-map := gconv.map
-+CFLAGS-utf8-utf16-z9.c += -Wa,-march=z9-109
-
- s390x-iconv-modules = ISO-8859-1_CP037_Z900 UTF8_UTF16_Z9 UTF16_UTF32_Z9 UTF8_UTF32_Z9
Modified: glibc-package/branches/eglibc-2.13/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series 2011-05-01 14:02:33 UTC (rev 4617)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series 2011-05-01 14:27:19 UTC (rev 4618)
@@ -160,7 +160,7 @@
powerpc/local-libgcc_eh-ld.so.diff
s390/submitted-nexttowardf.diff
-s390/submitted-iconv-z9-109.diff
+s390/cvs-iconv-z9-109.diff
sparc/local-fork.diff
sparc/local-sparcv9-target.diff
Reply to: