[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4560 - in glibc-package/branches/eglibc-2.13/debian: . patches patches/s390



Author: aurel32
Date: 2011-03-01 23:50:44 +0000 (Tue, 01 Mar 2011)
New Revision: 4560

Added:
   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:
  * Add patches/s390/submitted-iconv-z9-109.diff to fix FTBFS on s390
    with recent binutils.



Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog	2011-03-01 13:26:53 UTC (rev 4559)
+++ glibc-package/branches/eglibc-2.13/debian/changelog	2011-03-01 23:50:44 UTC (rev 4560)
@@ -131,6 +131,8 @@
     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.
 
   [ Samuel Thibault ]
   * Add patches/any/cvs-glro_dl_debug_mask.diff to fix build without

Added: 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	                        (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-iconv-z9-109.diff	2011-03-01 23:50:44 UTC (rev 4560)
@@ -0,0 +1,26 @@
+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-03-01 13:26:53 UTC (rev 4559)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series	2011-03-01 23:50:44 UTC (rev 4560)
@@ -148,6 +148,7 @@
 powerpc/local-libgcc_eh-ld.so.diff
 
 s390/submitted-nexttowardf.diff
+s390/submitted-iconv-z9-109.diff
 
 sparc/local-fork.diff
 sparc/local-sparcv9-target.diff


Reply to: