Author: aurel32
Date: 2008-08-13 01:17:22 +0000 (Wed, 13 Aug 2008)
New Revision: 3094
Removed:
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/hurd-i386/cvs-lock-memory-clobber.diff
glibc-package/branches/glibc-2.8/debian/patches/series
Log:
patches/hurd-i386/local-machine-lock.diff has been merged upstream
Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog 2008-08-12 23:35:20 UTC
(rev 3093)
+++ glibc-package/branches/glibc-2.8/debian/changelog 2008-08-13 01:17:22 UTC
(rev 3094)
@@ -9,6 +9,7 @@
+ rules.d/quilt.mk: fix the unpatch target
- Update any/cvs-getaddrinfo.diff.
- Update any/submitted-i686-timing.diff.
+ - Update hurd-i386/cvs-lock-memory-clobber.diff.
- Update kfreebsd/local-sys_queue_h.diff
- Update locale/preprocessor-collate-uli-sucks.diff
- Update localedata/tailor-iso14651_t1.diff.
@@ -65,7 +66,6 @@
- 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.
Modified:
glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/cvs-lock-memory-clobber.diff
===================================================================
---
glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/cvs-lock-memory-clobber.diff
2008-08-12 23:35:20 UTC (rev 3093)
+++
glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/cvs-lock-memory-clobber.diff
2008-08-13 01:17:22 UTC (rev 3094)
@@ -1,3 +1,8 @@
+2008-08-11 Aurelien Jarno <[EMAIL PROTECTED]>
+
+ * sysdeps/mach/i386/machine-lock.h (__spin_unlock, __spin_try_lock):
+ Fix asm constraints.
+
2008-08-02 Roland McGrath <[EMAIL PROTECTED]>
* sysdeps/mach/i386/machine-lock.h (__spin_unlock, __spin_try_lock):
@@ -22,7 +27,7 @@
__asm__ __volatile ("xchgl %0, %1"
- : "=&r" (__unlocked), "=m" (*__lock) : "0" (0));
+ : "=&r" (__unlocked), "=m" (*__lock) : "0" (0)
-+ : : "memory");
++ : "memory");
}
#endif
@@ -32,7 +37,7 @@
__asm__ __volatile ("xchgl %0, %1"
- : "=&r" (__locked), "=m" (*__lock) : "0" (1));
+ : "=&r" (__locked), "=m" (*__lock) : "0" (1)
-+ : : "memory");
++ : "memory");
return !__locked;
}
#endif
Deleted:
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
2008-08-12 23:35:20 UTC (rev 3093)
+++
glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/local-machine-lock.diff
2008-08-13 01:17:22 UTC (rev 3094)
@@ -1,22 +0,0 @@
-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-12
23:35:20 UTC (rev 3093)
+++ glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-13
01:17:22 UTC (rev 3094)
@@ -87,7 +87,6 @@
hurd-i386/cvs-open_2.diff
hurd-i386/cvs-fcntl-types.diff
hurd-i386/cvs-lock-memory-clobber.diff
-hurd-i386/local-machine-lock.diff
hurd-i386/local-pthread_posix-option.diff
hurd-i386/submitted-signal-werror.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
