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

Bug#166450: glibc: s390x support



Package: glibc
Version: 2.3.1-3
Severity: wishlist

the following patch enabled and fixes building on the not yet release
s390x (64bit s390) architecture.

bastian

-- 
Totally illogical, there was no chance.
		-- Spock, "The Galileo Seven", stardate 2822.3
diff -urN glibc-2.3.1.orig/debian/control glibc-2.3.1/debian/control
--- glibc-2.3.1.orig/debian/control	2002-10-26 14:18:52.000000000 +0200
+++ glibc-2.3.1/debian/control	2002-10-26 14:22:16.000000000 +0200
@@ -1,7 +1,7 @@
 Source: glibc
 Section: libs
 Priority: required
-Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-headers-2.4 [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.2, autoconf, binutils (>= 2.13.90.0.10-1) [!s390], binutils (>= 2.13.90.0.4-1) [s390]
+Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-headers-2.4 [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.2, autoconf, binutils (>= 2.13.90.0.10-1) [!s390 !s390x], binutils (>= 2.13.90.0.4-1) [s390 s390x]
 Build-Depends-Indep: perl, latex2html
 Build-Conflicts: kernel-headers-2.4.19-sparc [!sparc], kernel-headers-2.4.18-sparc [!sparc]
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
@@ -38,7 +38,7 @@
  by default. This created a package that unpacked to an excess of 30 megs.
 
 Package: nscd
-Architecture: alpha arm i386 m68k mips mipsel powerpc sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb freebsd-i386
+Architecture: alpha arm i386 m68k mips mipsel powerpc sparc ia64 hppa s390 s390x sh3 sh4 sh3eb sh4eb freebsd-i386
 Section: admin
 Priority: optional
 Depends: libc6 (>= ${Source-Version})
@@ -50,7 +50,7 @@
  slow Services like LDAP, NIS or NIS+
 
 Package: libc6
-Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 s390x hppa sh3 sh4 sh3eb sh4eb
 Section: base
 Priority: required
 Description: GNU C Library: Shared libraries and Timezone data
@@ -60,7 +60,7 @@
  Timezone data is also included.
 
 Package: libc6-dev
-Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 s390x hppa sh3 sh4 sh3eb sh4eb
 Section: devel
 Priority: standard
 Depends: libc6 (= ${Source-Version})
@@ -71,7 +71,7 @@
  and link programs which use the standard C library.
 
 Package: libc6-dbg
-Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 s390x hppa sh3 sh4 sh3eb sh4eb
 Section: devel
 Priority: extra
 Depends: libc6 (= ${Source-Version})
@@ -84,7 +84,7 @@
  Most people will not need this package.
 
 Package: libc6-prof
-Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 s390x hppa sh3 sh4 sh3eb sh4eb
 Section: devel
 Priority: extra
 Depends: libc6 (= ${Source-Version})
@@ -93,7 +93,7 @@
  with gprof.
 
 Package: libc6-pic
-Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 s390x hppa sh3 sh4 sh3eb sh4eb
 Section: devel
 Priority: optional
 Conflicts: libc-pic
diff -urN glibc-2.3.1.orig/debian/control.in/main glibc-2.3.1/debian/control.in/main
--- glibc-2.3.1.orig/debian/control.in/main	2002-10-26 14:18:52.000000000 +0200
+++ glibc-2.3.1/debian/control.in/main	2002-10-26 14:20:56.000000000 +0200
@@ -1,7 +1,7 @@
 Source: @glibc@
 Section: libs
 Priority: required
-Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-headers-2.4 [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.2, autoconf, binutils (>= 2.13.90.0.10-1) [!s390], binutils (>= 2.13.90.0.4-1) [s390]
+Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-headers-2.4 [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.2, autoconf, binutils (>= 2.13.90.0.10-1) [!s390 !s390x], binutils (>= 2.13.90.0.4-1) [s390 s390x]
 Build-Depends-Indep: perl, latex2html
 Build-Conflicts: kernel-headers-2.4.19-sparc [!sparc], kernel-headers-2.4.18-sparc [!sparc]
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
diff -urN glibc-2.3.1.orig/debian/patches/glibc22-hppa-pthreads.dpatch glibc-2.3.1/debian/patches/glibc22-hppa-pthreads.dpatch
--- glibc-2.3.1.orig/debian/patches/glibc22-hppa-pthreads.dpatch	2002-10-26 14:18:52.000000000 +0200
+++ glibc-2.3.1/debian/patches/glibc22-hppa-pthreads.dpatch	2002-10-26 14:20:38.000000000 +0200
@@ -722,8 +722,9 @@
  
  /* Spinlock implementation; required.  */
 -PT_EI long int
+-testandset (int *spinlock)
 +PT_EI int
- testandset (int *spinlock)
++try_lock (int *spinlock)
  {
    int ret;
 @@ -41,6 +41,7 @@
diff -urN glibc-2.3.1.orig/debian/rules.d/control.mk glibc-2.3.1/debian/rules.d/control.mk
--- glibc-2.3.1.orig/debian/rules.d/control.mk	2002-10-26 14:18:52.000000000 +0200
+++ glibc-2.3.1/debian/rules.d/control.mk	2002-10-26 14:22:31.000000000 +0200
@@ -1,11 +1,11 @@
 # Add opt to this line to generate optimized packages
 control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.3 libc1 sparc64) # 
 
-threads_archs := alpha arm i386 m68k mips mipsel powerpc sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb freebsd-i386
+threads_archs := alpha arm i386 m68k mips mipsel powerpc sparc ia64 hppa s390 s390x sh3 sh4 sh3eb sh4eb freebsd-i386
 
 debian/control.in/libc6: debian/control.in/libc debian/rules.d/control.mk
 	sed -e 's%@libc@%libc6%g' \
-	    -e 's%@archs@%arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
+	    -e 's%@archs@%arm i386 m68k mips mipsel powerpc sparc s390 s390x hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
 
 debian/control.in/libc6.1: debian/control.in/libc debian/rules.d/control.mk
 	sed -e 's%@libc@%libc6.1%g;s%@archs@%alpha ia64%g' < $< > $@
diff -urN glibc-2.3.1.orig/debian/sysdeps/linux.mk glibc-2.3.1/debian/sysdeps/linux.mk
--- glibc-2.3.1.orig/debian/sysdeps/linux.mk	2002-10-26 14:18:52.000000000 +0200
+++ glibc-2.3.1/debian/sysdeps/linux.mk	2002-10-26 14:22:45.000000000 +0200
@@ -51,3 +51,6 @@
 ifeq ($(DEB_HOST_GNU_CPU),s390)
   extra_config_options := --enable-omitfp
 endif
+ifeq ($(DEB_HOST_GNU_CPU),s390x)
+  extra_config_options := --enable-omitfp
+endif

Attachment: pgpp3I5ZHb1NC.pgp
Description: PGP signature


Reply to: