r3759 - in glibc-package/branches/multiarch/debian: . control.in debhelper.in patches patches/any patches/kfreebsd rules.d
Author: aurel32
Date: 2009-08-10 23:19:54 +0000 (Mon, 10 Aug 2009)
New Revision: 3759
Added:
glibc-package/branches/multiarch/debian/debhelper.in/libc-alt.lintian-overrides
glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian-overrides
glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-alt.lintian-overrides
glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.lintian-overrides
glibc-package/branches/multiarch/debian/debhelper.in/libc-otherbuild.lintian-overrides
glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian-overrides
Removed:
glibc-package/branches/multiarch/debian/debhelper.in/libc-alt.lintian
glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian
glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-alt.lintian
glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.lintian
glibc-package/branches/multiarch/debian/debhelper.in/libc-otherbuild.lintian
glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian
glibc-package/branches/multiarch/debian/patches/any/cvs-pthread_mutex_lock.diff
Modified:
glibc-package/branches/multiarch/debian/changelog
glibc-package/branches/multiarch/debian/control
glibc-package/branches/multiarch/debian/control.in/libc
glibc-package/branches/multiarch/debian/control.in/main
glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff
glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/branches/multiarch/debian/patches/series
glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
Log:
Merge from trunk
Modified: glibc-package/branches/multiarch/debian/changelog
===================================================================
--- glibc-package/branches/multiarch/debian/changelog 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/changelog 2009-08-10 23:19:54 UTC (rev 3759)
@@ -1,25 +1,31 @@
-eglibc (2.9-23+multiarch.2) experimental; urgency=low
+eglibc (2.9-25) UNRELEASED; urgency=low
- * Remove the Depends: line in libc-bin and add the corresponding
- override for lintian.
+ * Remove Ben Collins <bcollins@debian.org> from the uploaders (Closes:
+ bug#540901).
- -- Aurelien Jarno <aurel32@debian.org> Mon, 03 Aug 2009 00:27:06 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 11 Aug 2009 00:06:09 +0200
-eglibc (2.9-23+multiarch.1) experimental; urgency=low
+eglibc (2.9-24) unstable; urgency=low
+ [ Aurelien Jarno ]
+ * Remove any/cvs-pthread_mutex_lock.diff following upstream decision.
* Replace debian/sysdeps/depflags.{mk,pl} by entries in debian/control
using the "new" dpkg-dev features. Clean-out some very old entries.
- * Switch the Pre-Depends: libc-bin to a simple Depends:.
+ * Recommends libc6-i686 on amd64 and libc0.1-i686 on kfreebsd-amd64
+ (Closes: bug#455603).
+ * Don't access dpkg files directly in libc6.preinst.
+ * patches/any/local-ld-multiarch.diff: convert i586 and i686 into i486
+ (Closes: bug#540646).
+ * debian/rules.d/debhelper.mk: use dh_lintian instead doing the work
+ manually.
+ * Split out libc-bin from libc6 and libc-dev-bin from libc6-dev.
+ (Closes: #330735).
- -- Aurelien Jarno <aurel32@debian.org> Wed, 29 Jul 2009 16:37:35 +0200
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2696 (from glibc-bsd).
-eglibc (2.9-23+multiarch) experimental; urgency=low
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 10 Aug 2009 14:32:35 +0200
- * Split out libc-bin from libc6 and libc-dev-bin from libc6-dev.
- Closes: #330735.
-
- -- Aurelien Jarno <aurel32@debian.org> Mon, 27 Jul 2009 01:10:35 +0200
-
eglibc (2.9-23) unstable; urgency=low
* debhelper.in/libc.postinst, sysdeps/depflags.pl: remove upgrade code
Modified: glibc-package/branches/multiarch/debian/control
===================================================================
--- glibc-package/branches/multiarch/debian/control 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/control 2009-08-10 23:19:54 UTC (rev 3759)
@@ -11,7 +11,7 @@
g++-4.3 (>= 4.3.3-2) [alpha]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
-Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
+Uploaders: GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
Standards-Version: 3.8.2
Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
@@ -20,6 +20,7 @@
Architecture: any
Section: libs
Priority: required
+Breaks: libc0.1 (<< 2.9), libc0.3 (<< 2.9), libc6 (<< 2.9), libc6.1 (<< 2.9)
Replaces: libc0.1, libc0.3, libc6, libc6.1
Description: GNU C Library: Binaries
This package contains utility programs related to the GNU C Library.
@@ -98,6 +99,7 @@
Section: libs
Priority: required
Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
@@ -172,6 +174,7 @@
Section: libs
Priority: required
Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
@@ -246,6 +249,7 @@
Section: libs
Priority: required
Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
@@ -320,6 +324,7 @@
Section: libs
Priority: required
Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
Modified: glibc-package/branches/multiarch/debian/control.in/libc
===================================================================
--- glibc-package/branches/multiarch/debian/control.in/libc 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/control.in/libc 2009-08-10 23:19:54 UTC (rev 3759)
@@ -3,6 +3,7 @@
Section: libs
Priority: required
Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
Modified: glibc-package/branches/multiarch/debian/control.in/main
===================================================================
--- glibc-package/branches/multiarch/debian/control.in/main 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/control.in/main 2009-08-10 23:19:54 UTC (rev 3759)
@@ -11,7 +11,7 @@
g++-4.3 (>= 4.3.3-2) [alpha]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
-Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
+Uploaders: GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
Standards-Version: 3.8.2
Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
Deleted: glibc-package/branches/multiarch/debian/debhelper.in/libc-alt.lintian
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-alt.lintian 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-alt.lintian 2009-08-10 23:19:54 UTC (rev 3759)
@@ -1,15 +0,0 @@
-# libpthread must be stripped specially; GDB needs the non-dynamic
-# symbol table in order to load the thread debugging library.
-LIBC-FLAVOR: unstripped-binary-or-object .SLIBDIR/libpthread-2.9.so
-
-# Those file are actually .o files not package in a ar archive, and
-# thus should not be stripped
-LIBC-FLAVOR: unstripped-binary-or-object .LIBDIR/libieee.a
-LIBC-FLAVOR: unstripped-binary-or-object .LIBDIR/libmcheck.a
-
-# ld.so must be executable, otherwise the system will not work
-LIBC-FLAVOR: shlib-with-executable-bit .SLIBDIR/ld-2.9.so 0755
-
-# It is normal that the ELF dynamic linker does not need any other
-# library
-LIBC-FLAVOR: shared-lib-without-dependency-information .SLIBDIR/ld-2.9.so
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-alt.lintian-overrides
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-alt.lintian-overrides (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-alt.lintian-overrides 2009-08-10 23:19:54 UTC (rev 3759)
@@ -0,0 +1,15 @@
+# libpthread must be stripped specially; GDB needs the non-dynamic
+# symbol table in order to load the thread debugging library.
+LIBC-FLAVOR: unstripped-binary-or-object .SLIBDIR/libpthread-2.9.so
+
+# Those file are actually .o files not package in a ar archive, and
+# thus should not be stripped
+LIBC-FLAVOR: unstripped-binary-or-object .LIBDIR/libieee.a
+LIBC-FLAVOR: unstripped-binary-or-object .LIBDIR/libmcheck.a
+
+# ld.so must be executable, otherwise the system will not work
+LIBC-FLAVOR: shlib-with-executable-bit .SLIBDIR/ld-2.9.so 0755
+
+# It is normal that the ELF dynamic linker does not need any other
+# library
+LIBC-FLAVOR: shared-lib-without-dependency-information .SLIBDIR/ld-2.9.so
Deleted: glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian 2009-08-10 23:19:54 UTC (rev 3759)
@@ -1,13 +0,0 @@
-# ldconfig must be executable even when the libc is not configured, and
-# thus must be linked statically
-libc-bin: statically-linked-binary ./sbin/ldconfig
-
-# ld.so must be executable, otherwise the system will not work
-libc-bin: shlib-with-executable-bit lib/ld-2.9.so 0755
-
-# pt_chown must be setuid root, otherwise non-root users won't be able
-# to login
-libc-bin: setuid-binary usr/lib/pt_chown 4755 root/root
-
-# libc-bin depending on libc6 make apt crazy...
-libc-bin: missing-depends-line
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian-overrides
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian-overrides (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian-overrides 2009-08-10 23:19:54 UTC (rev 3759)
@@ -0,0 +1,13 @@
+# ldconfig must be executable even when the libc is not configured, and
+# thus must be linked statically
+libc-bin: statically-linked-binary ./sbin/ldconfig
+
+# ld.so must be executable, otherwise the system will not work
+libc-bin: shlib-with-executable-bit lib/ld-2.9.so 0755
+
+# pt_chown must be setuid root, otherwise non-root users won't be able
+# to login
+libc-bin: setuid-binary usr/lib/pt_chown 4755 root/root
+
+# libc-bin depending on libc6 make apt crazy...
+libc-bin: missing-depends-line
Deleted: glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-alt.lintian
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-alt.lintian 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-alt.lintian 2009-08-10 23:19:54 UTC (rev 3759)
@@ -1,4 +0,0 @@
-# Those file are actually .o files not package in a ar archive, and
-# thus should not be stripped
-LIBC-dev-FLAVOR: unstripped-binary-or-object .LIBDIR/libieee.a
-LIBC-dev-FLAVOR: unstripped-binary-or-object .LIBDIR/libmcheck.a
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-alt.lintian-overrides
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-alt.lintian-overrides (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-alt.lintian-overrides 2009-08-10 23:19:54 UTC (rev 3759)
@@ -0,0 +1,4 @@
+# Those file are actually .o files not package in a ar archive, and
+# thus should not be stripped
+LIBC-dev-FLAVOR: unstripped-binary-or-object .LIBDIR/libieee.a
+LIBC-dev-FLAVOR: unstripped-binary-or-object .LIBDIR/libmcheck.a
Deleted: glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.lintian
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.lintian 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.lintian 2009-08-10 23:19:54 UTC (rev 3759)
@@ -1,6 +0,0 @@
-# Those file are actually .o files not package in a ar archive, and
-# thus should not be stripped
-LIBC-dev: unstripped-binary-or-object ./usr/lib/libieee.a
-LIBC-dev: unstripped-binary-or-object ./usr/lib/libmcheck.a
-LIBC-dev: unstripped-binary-or-object ./usr/lib/xen/libieee.a
-LIBC-dev: unstripped-binary-or-object ./usr/lib/xen/libmcheck.a
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.lintian-overrides
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.lintian-overrides (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.lintian-overrides 2009-08-10 23:19:54 UTC (rev 3759)
@@ -0,0 +1,6 @@
+# Those file are actually .o files not package in a ar archive, and
+# thus should not be stripped
+LIBC-dev: unstripped-binary-or-object ./usr/lib/libieee.a
+LIBC-dev: unstripped-binary-or-object ./usr/lib/libmcheck.a
+LIBC-dev: unstripped-binary-or-object ./usr/lib/xen/libieee.a
+LIBC-dev: unstripped-binary-or-object ./usr/lib/xen/libmcheck.a
Deleted: glibc-package/branches/multiarch/debian/debhelper.in/libc-otherbuild.lintian
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-otherbuild.lintian 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-otherbuild.lintian 2009-08-10 23:19:54 UTC (rev 3759)
@@ -1,3 +0,0 @@
-# libpthread must be stripped specially; GDB needs the non-dynamic
-# symbol table in order to load the thread debugging library.
-LIBC-FLAVOR: unstripped-binary-or-object .SLIBDIR/libpthread-2.9.so
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-otherbuild.lintian-overrides
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-otherbuild.lintian-overrides (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-otherbuild.lintian-overrides 2009-08-10 23:19:54 UTC (rev 3759)
@@ -0,0 +1,3 @@
+# libpthread must be stripped specially; GDB needs the non-dynamic
+# symbol table in order to load the thread debugging library.
+LIBC-FLAVOR: unstripped-binary-or-object .SLIBDIR/libpthread-2.9.so
Deleted: glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian 2009-08-10 23:19:54 UTC (rev 3759)
@@ -1,13 +0,0 @@
-# libpthread must be stripped specially; GDB needs the non-dynamic
-# symbol table in order to load the thread debugging library.
-LIBC: unstripped-binary-or-object ./lib/libpthread-2.9.so
-
-# ld.so must be executable, otherwise the system will not work
-LIBC: shlib-with-executable-bit lib/ld-2.9.so 0755
-
-# It is normal that the ELF dynamic linker does not need any other
-# library
-LIBC: shared-lib-without-dependency-information ./lib/ld-2.9.so
-
-# dependency on debconf is not needed, as glibc has a fallback to tty
-LIBC: missing-debconf-dependency-for-preinst
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian-overrides
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian-overrides (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian-overrides 2009-08-10 23:19:54 UTC (rev 3759)
@@ -0,0 +1,13 @@
+# libpthread must be stripped specially; GDB needs the non-dynamic
+# symbol table in order to load the thread debugging library.
+LIBC: unstripped-binary-or-object ./lib/libpthread-2.9.so
+
+# ld.so must be executable, otherwise the system will not work
+LIBC: shlib-with-executable-bit lib/ld-2.9.so 0755
+
+# It is normal that the ELF dynamic linker does not need any other
+# library
+LIBC: shared-lib-without-dependency-information ./lib/ld-2.9.so
+
+# dependency on debconf is not needed, as glibc has a fallback to tty
+LIBC: missing-debconf-dependency-for-preinst
Deleted: glibc-package/branches/multiarch/debian/patches/any/cvs-pthread_mutex_lock.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/any/cvs-pthread_mutex_lock.diff 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/patches/any/cvs-pthread_mutex_lock.diff 2009-08-10 23:19:54 UTC (rev 3759)
@@ -1,110 +0,0 @@
-2009-07-26 Ulrich Drepper <drepper@redhat.com>
-
- [BZ #10418]
- * pthread_mutex_lock.c (pthread_mutex_lock): Use _rel instead of of
- _acq variants of cmpxchg.
- * pthread_mutex_timedlock.c (pthread_mutex_timedlock): Likewise.
-
- * sysdeps/x86_64/configure.in: New file.
---- a/nptl/pthread_mutex_lock.c
-+++ b/nptl/pthread_mutex_lock.c
-@@ -160,7 +160,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
- #endif
-
- newval
-- = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
-+ = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
- newval, oldval);
-
- if (newval != oldval)
-@@ -285,7 +285,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
- #ifdef NO_INCR
- newval |= FUTEX_WAITERS;
- #endif
-- oldval = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
-+ oldval = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
- newval, 0);
-
- if (oldval != 0)
-@@ -420,7 +420,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
- oldprio = ceiling;
-
- oldval
-- = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
-+ = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
- #ifdef NO_INCR
- ceilval | 2,
- #else
-@@ -434,7 +434,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
- do
- {
- oldval
-- = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
-+ = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
- ceilval | 2,
- ceilval | 1);
-
-@@ -445,7 +445,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
- lll_futex_wait (&mutex->__data.__lock, ceilval | 2,
- PTHREAD_MUTEX_PSHARED (mutex));
- }
-- while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
-+ while (atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
- ceilval | 2, ceilval)
- != ceilval);
- }
-diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c
-index 8d0db79..2c6ff11 100644
---- a/nptl/pthread_mutex_timedlock.c
-+++ b/nptl/pthread_mutex_timedlock.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002-2007, 2008 Free Software Foundation, Inc.
-+/* Copyright (C) 2002-2007, 2008, 2009 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
-@@ -126,7 +126,7 @@ pthread_mutex_timedlock (mutex, abstime)
- int newval = id | (oldval & FUTEX_WAITERS);
-
- newval
-- = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
-+ = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
- newval, oldval);
- if (newval != oldval)
- {
-@@ -246,7 +246,7 @@ pthread_mutex_timedlock (mutex, abstime)
- }
- }
-
-- oldval = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
-+ oldval = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
- id, 0);
-
- if (oldval != 0)
-@@ -404,7 +404,7 @@ pthread_mutex_timedlock (mutex, abstime)
- oldprio = ceiling;
-
- oldval
-- = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
-+ = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
- ceilval | 1, ceilval);
-
- if (oldval == ceilval)
-@@ -413,7 +413,7 @@ pthread_mutex_timedlock (mutex, abstime)
- do
- {
- oldval
-- = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
-+ = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
- ceilval | 2,
- ceilval | 1);
-
-@@ -456,7 +456,7 @@ pthread_mutex_timedlock (mutex, abstime)
- PTHREAD_MUTEX_PSHARED (mutex));
- }
- }
-- while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
-+ while (atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
- ceilval | 2, ceilval)
- != ceilval);
- }
Modified: glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff 2009-08-10 23:19:54 UTC (rev 3759)
@@ -1,3 +1,7 @@
+2009-08-09 Aurelien Jarno <aurelien@aurel32.net>
+
+ * Makeconfig: convert i586 and i686 into i486.
+
2005-01-20 Tollef Fog Heen <tfheen@debian.org>
* Makeconfig: add multiarch support
@@ -2,21 +6,22 @@
----
- Makeconfig | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
--- a/Makeconfig
+++ b/Makeconfig
-@@ -191,6 +191,11 @@
+@@ -191,6 +191,16 @@
endif
inst_libdir = $(install_root)$(libdir)
-+# Extra places to look for libraries
++# Multiarch places to look for libraries
+ifndef extra_libdir
-+extra_libdir = /lib/$(config-machine)-$(config-os):$(exec_prefix)/lib/$(config-machine)-$(config-os)
++ifneq (,$(findstring $(config-machine),i586 i686))
++multiarch-machine = i486
++else
++multiarch-machine = $(config-machine)
+endif
++extra_libdir = /lib/$(multiarch-machine)-$(config-os):$(exec_prefix)/lib/$(multiarch-machine)-$(config-os)
++endif
+
# Where to install the shared library and dynamic linker.
ifndef slibdir
slibdir = $(exec_prefix)/lib
-@@ -501,6 +506,10 @@
+@@ -501,6 +511,10 @@
default-rpath = $(libdir)
Modified: glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff 2009-08-10 23:19:54 UTC (rev 3759)
@@ -47,7 +47,7 @@
+gnu
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Makefile
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,133 @@
+# Use bash, not /bin/sh, for executing scripts, because the native
+# FreeBSD /bin/sh does not interpret the IFS="<tab>" read ... command
+# in localedata/tst-fmon.sh correctly.
@@ -128,6 +128,8 @@
+sysdep_routines += rtprio
+# For <sys/socket.h>.
+sysdep_routines += bsd_sendfile
++# For <sys/stat.h>.
++sysdep_routines += devname
+# For <sys/sysctl.h>.
+sysdep_routines += sysctl sysctlbyname sysctlnametomib
+# For <sys/uio.h>.
@@ -5828,7 +5830,7 @@
+#endif /* bits/socket.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/stat.h
-@@ -0,0 +1,199 @@
+@@ -0,0 +1,203 @@
+/* Copyright (C) 1992, 1996-1997, 2000, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -6025,6 +6027,10 @@
+/* Set file flags of the file referred to by FD to FLAGS. */
+extern int fchflags (int __fd, unsigned long int __flags) __THROW;
+
++
++extern char *devname_r(dev_t dev, mode_t type, char *buf, int len) __THROW;
++extern char *devname(dev_t dev, mode_t type) __THROW;
++
+__END_DECLS
+
+#endif /* __USE_BSD */
@@ -7935,6 +7941,78 @@
+weak_alias (__libc_connect, __connect)
+weak_alias (__libc_connect, connect)
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/devname.c
+@@ -0,0 +1,69 @@
++/*
++ * Copyright (c) 1989, 1993
++ * The Regents of the University of California. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 4. Neither the name of the University nor the names of its contributors
++ * may be used to endorse or promote products derived from this software
++ * without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
++
++#include <stdio.h>
++#include <sys/param.h>
++#include <sys/stat.h>
++#include <sys/sysctl.h>
++
++char *
++__devname_r(dev_t dev, mode_t type, char *buf, int len)
++{
++ int i;
++ size_t j;
++ const char *r;
++
++ if ((type & S_IFMT) == S_IFCHR) {
++ j = len;
++ i = __sysctlbyname("kern.devname", buf, &j, &dev, sizeof (dev));
++ if (i == 0)
++ return (buf);
++ }
++
++ /* Finally just format it */
++ if (dev == NODEV)
++ r = "#NODEV";
++ else
++ r = "#%c:%d:0x%x";
++ __snprintf(buf, len, r,
++ (type & S_IFMT) == S_IFCHR ? 'C' : 'B', major(dev), minor(dev));
++ return (buf);
++}
++
++
++char *
++__devname(dev_t dev, mode_t type)
++{
++ static char buf[SPECNAMELEN + 1];
++
++ return(__devname_r(dev, type, buf, sizeof(buf)));
++}
++weak_alias (__devname_r, devname_r)
++weak_alias (__devname, devname)
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/dl-execstack.c
@@ -0,0 +1,58 @@
+/* Stack executability handling for GNU dynamic linker. Linux version.
@@ -22479,21 +22557,21 @@
+int
+__sysctlbyname (const char *name, void *oldval, size_t *oldlenp, void *newval, size_t newlen)
+{
-+ int request[CTL_MAXNAME];
-+ size_t requestlen = sizeof (request);
++ int request[CTL_MAXNAME+2];
++ size_t requestlen = CTL_MAXNAME+2;
+
+ if (__sysctlnametomib(name, request, &requestlen) < 0)
+ return -1;
+
+ /* Now call sysctl using the binary encoded request. */
-+ return __sysctl (request, requestlen / sizeof (int),
++ return __sysctl (request, requestlen,
+ oldval, oldlenp, newval, newlen);
+}
+
+weak_alias (__sysctlbyname, sysctlbyname)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sysctlnametomib.c
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,38 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -22519,15 +22597,16 @@
+int
+__sysctlnametomib (const char *name, int *mibp, size_t *sizep)
+{
-+ int request[CTL_MAXNAME];
-+ size_t requestlen = sizeof (request);
-+
+ /* Convert the string NAME to a binary encoded request. The kernel
+ contains a routine for doing this, called "name2oid". But the way
+ to call it is a little bit strange. */
+ int name2oid_request[2] = { 0, 3 };
-+ return __sysctl (name2oid_request, 2, mibp, sizep, (void *) name,
-+ strlen (name));
++ int retval;
++
++ *sizep *= sizeof (int);
++ retval = __sysctl (name2oid_request, 2, mibp, sizep, (void *) name, strlen (name));
++ *sizep /= sizeof (int);
++ return retval;
+}
+
+weak_alias (__sysctlnametomib, sysctlnametomib)
Modified: glibc-package/branches/multiarch/debian/patches/series
===================================================================
--- glibc-package/branches/multiarch/debian/patches/series 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/patches/series 2009-08-10 23:19:54 UTC (rev 3759)
@@ -215,5 +215,4 @@
any/cvs-sunrpc-license.diff
any/submitted-tst-cpucount.diff
any/cvs-getaddrinfo-nss-notfound.diff
-any/cvs-pthread_mutex_lock.diff
any/cvs-signalfd-eventfd.diff
Modified: glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-08-10 22:08:08 UTC (rev 3758)
+++ glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-08-10 23:19:54 UTC (rev 3759)
@@ -47,6 +47,7 @@
fi
dh_installinit -p$(curpass)
dh_installdocs -p$(curpass)
+ dh_lintian -p $(curpass)
dh_link -p$(curpass)
set -e; if test -d debian/bug/$(curpass); then \
dh_installdirs -p$(curpass) usr/share/bug; \
@@ -99,12 +100,6 @@
chmod a+x debian/shlibs-add-udebs
./debian/shlibs-add-udebs $(curpass)
- if [ -f debian/$(curpass).lintian ] ; then \
- install -d -m 755 -o root -g root debian/$(curpass)/usr/share/lintian/overrides/ ; \
- install -m 644 -o root -g root debian/$(curpass).lintian \
- debian/$(curpass)/usr/share/lintian/overrides/$(curpass) ; \
- fi
-
dh_installdeb -p$(curpass)
dh_shlibdeps -p$(curpass)
dh_gencontrol -p$(curpass)
@@ -234,8 +229,7 @@
rm -f debian/*.docs
rm -f debian/*.doc-base
rm -f debian/*.generated
- rm -f debian/*.lintian
- rm -f debian/*.linda
+ rm -f debian/*.lintian-overrides
rm -f debian/*.NEWS
rm -f debian/*.README.Debian
Reply to: