r3086 - in glibc-package/branches/glibc-2.8/debian: . patches patches/hurd-i386 sysdeps
Author: aurel32
Date: 2008-08-11 03:54:11 +0000 (Mon, 11 Aug 2008)
New Revision: 3086
Added:
glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/local-machine-lock.diff
Modified:
glibc-package/branches/glibc-2.8/debian/changelog
glibc-package/branches/glibc-2.8/debian/patches/series
glibc-package/branches/glibc-2.8/debian/sysdeps/kfreebsd.mk
Log:
- Add patches/hurd-i386/local-machine-lock.diff.
Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog 2008-08-11 03:50:09 UTC (rev 3085)
+++ glibc-package/branches/glibc-2.8/debian/changelog 2008-08-11 03:54:11 UTC (rev 3086)
@@ -65,6 +65,7 @@
- Remove localedata/locale-pt_PT.diff (merged).
- Add patches/alpha/submitted-creat64.diff from Gentoo.
- Add patches/alpha/submitted-dl-support.diff from Gentoo.
+ - Add patches/hurd-i386/local-machine-lock.diff.
- debian/shlibver: bump to 2.8.
- debian/locales-depver: bump to 2.8.
* Convert all patch to patchlevel -p1. Closes: #485165.
Added: glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/local-machine-lock.diff
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/local-machine-lock.diff (rev 0)
+++ glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/local-machine-lock.diff 2008-08-11 03:54:11 UTC (rev 3086)
@@ -0,0 +1,22 @@
+diff --git a/sysdeps/mach/i386/machine-lock.h b/sysdeps/mach/i386/machine-lock.h
+index ca87647..33602f4 100644
+--- a/sysdeps/mach/i386/machine-lock.h
++++ b/sysdeps/mach/i386/machine-lock.h
+@@ -41,7 +41,7 @@ __spin_unlock (__spin_lock_t *__lock)
+ register int __unlocked;
+ __asm__ __volatile ("xchgl %0, %1"
+ : "=&r" (__unlocked), "=m" (*__lock) : "0" (0)
+- : : "memory");
++ : "memory");
+ }
+
+ /* Try to lock LOCK; return nonzero if we locked it, zero if another has. */
+@@ -52,7 +52,7 @@ __spin_try_lock (__spin_lock_t *__lock)
+ register int __locked;
+ __asm__ __volatile ("xchgl %0, %1"
+ : "=&r" (__locked), "=m" (*__lock) : "0" (1)
+- : : "memory");
++ : "memory");
+ return !__locked;
+ }
+
Modified: glibc-package/branches/glibc-2.8/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-11 03:50:09 UTC (rev 3085)
+++ glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-11 03:54:11 UTC (rev 3086)
@@ -65,6 +65,7 @@
hppa/submitted-nptl-carlos.diff
hppa/submitted-pie.diff
+hurd-i386/local-machine-lock.diff
hurd-i386/local-dl-dynamic-weak.diff
hurd-i386/local-enable-ldconfig.diff
hurd-i386/local-mlock.diff
Modified: glibc-package/branches/glibc-2.8/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/kfreebsd.mk 2008-08-11 03:50:09 UTC (rev 3085)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/kfreebsd.mk 2008-08-11 03:54:11 UTC (rev 3086)
@@ -24,6 +24,7 @@
$(stamp)mkincludedir:
rm -rf debian/include
mkdir debian/include
+ ln -s $(KFREEBSD_HEADERS)/bsm debian/include
ln -s $(KFREEBSD_HEADERS)/net debian/include
ln -s $(KFREEBSD_HEADERS)/netatalk debian/include
ln -s $(KFREEBSD_HEADERS)/netipx debian/include
Reply to: