r1596 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/patches/alpha branches/glibc-2.4/debian/sysdeps trunk/debian trunk/debian/patches/alpha
Author: aurel32
Date: 2006-05-31 05:12:48 +0000 (Wed, 31 May 2006)
New Revision: 1596
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/alpha/local-gcc4.1.diff
glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/alpha/local-gcc4.1.diff
Log:
* debian/patches/alpha/local-gcc4.1.diff: fix a small typo. sigh.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-30 22:16:46 UTC (rev 1595)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-31 05:12:48 UTC (rev 1596)
@@ -112,8 +112,14 @@
-- Aurelien Jarno <aurel32@debian.org> Sun, 28 May 2006 03:28:14 +0200
-glibc (2.3.6-12) UNRELEASED; urgency=low
+glibc (2.3.6-13) UNRELEASED; urgency=low
+ * debian/patches/alpha/local-gcc4.1.diff: fix a small typo. sigh.
+
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 31 May 2006 00:16:24 +0200
+
+glibc (2.3.6-12) unstable; urgency=low
+
* Don't do a udeb pass, it is still too buggy. (Closes: #369492)
* debian/control.in/main: build-depends on libc6-dev-sparc64 on sparc.
* Add patches/alpha/local-gcc4.1.diff (fix build with gcc-4.1) from
@@ -121,7 +127,7 @@
* patches/kfreebsd/local-sysdeps.diff: update to revision 1571 (from
glibc-bsd).
- -- Aurelien Jarno <aurel32@debian.org> Tue, 30 May 2006 06:53:29 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 30 May 2006 22:35:35 +0200
glibc (2.3.6-11) unstable; urgency=low
Modified: glibc-package/branches/glibc-2.4/debian/patches/alpha/local-gcc4.1.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/alpha/local-gcc4.1.diff 2006-05-30 22:16:46 UTC (rev 1595)
+++ glibc-package/branches/glibc-2.4/debian/patches/alpha/local-gcc4.1.diff 2006-05-31 05:12:48 UTC (rev 1596)
@@ -27,7 +27,7 @@
stw_mb(unsigned short val, unsigned long addr)
{
- __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
-+ __asm__("".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
++ __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
}
static inline void
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk 2006-05-30 22:16:46 UTC (rev 1595)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk 2006-05-31 05:12:48 UTC (rev 1596)
@@ -1,9 +1,13 @@
-GLIBC_PASSES += nptl s390x
+# NPTL Config
+GLIBC_PASSES += nptl
+
+# build 64-bit (s390x) alternative library
+GLIBC_PASSES += s390x
DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
-
+s390x_MIN_KERNEL_SUPPORTED = 2.6.0
s390x_configure_target = s390x-linux
s390x_CC = $(CC) -m64
-s390x_add-ons = linuxthreads $(add-ons)
+s390x_add-ons = nptl $(add-ons)
libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver))
s390x_extra_cflags = -g1 -O3
s390x_slibdir = /lib64
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-05-30 22:16:46 UTC (rev 1595)
+++ glibc-package/trunk/debian/changelog 2006-05-31 05:12:48 UTC (rev 1596)
@@ -1,6 +1,6 @@
glibc (2.3.6-13) UNRELEASED; urgency=low
- *
+ * debian/patches/alpha/local-gcc4.1.diff: fix a small typo. sigh.
-- Aurelien Jarno <aurel32@debian.org> Wed, 31 May 2006 00:16:24 +0200
Modified: glibc-package/trunk/debian/patches/alpha/local-gcc4.1.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/local-gcc4.1.diff 2006-05-30 22:16:46 UTC (rev 1595)
+++ glibc-package/trunk/debian/patches/alpha/local-gcc4.1.diff 2006-05-31 05:12:48 UTC (rev 1596)
@@ -27,7 +27,7 @@
stw_mb(unsigned short val, unsigned long addr)
{
- __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
-+ __asm__("".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
++ __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
}
static inline void
Reply to: