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

r4089 - in glibc-package/branches/eglibc-2.11/debian: . patches patches/hurd-i386



Author: sthibault
Date: 2010-01-17 17:31:53 +0000 (Sun, 17 Jan 2010)
New Revision: 4089

Added:
   glibc-package/branches/eglibc-2.11/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff
Modified:
   glibc-package/branches/eglibc-2.11/debian/changelog
   glibc-package/branches/eglibc-2.11/debian/patches/series
Log:
debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff: New patch to fix elf/ build on hurd-i386.


Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog	2010-01-17 10:25:51 UTC (rev 4088)
+++ glibc-package/branches/eglibc-2.11/debian/changelog	2010-01-17 17:31:53 UTC (rev 4089)
@@ -30,6 +30,10 @@
   [ Aurelien Jarno ]
   * Enable multi-arch.
 
+  [ Samuel Thibault ]
+  * debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff: New patch to
+    fix elf/ build on hurd-i386.
+
  -- Aurelien Jarno <aurel32@debian.org>  Tue, 29 Dec 2009 01:10:49 +0100
 
 eglibc (2.10.2-3) UNRELEASED; urgency=low

Added: glibc-package/branches/eglibc-2.11/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff	                        (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff	2010-01-17 17:31:53 UTC (rev 4089)
@@ -0,0 +1,31 @@
+2010-01-17  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* sysdeps/mach/hurd/bits/libc-lock.h (__rtld_lock_recursive_t): New
+	type.
+	(__rtld_lock_initialize): New macro.
+
+---
+ libc-lock.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sysdeps/mach/hurd/bits/libc-lock.h b/sysdeps/mach/hurd/bits/libc-lock.h
+index 0fa90bc..eadd98d 100644
+--- a/sysdeps/mach/hurd/bits/libc-lock.h
++++ b/sysdeps/mach/hurd/bits/libc-lock.h
+@@ -31,6 +31,7 @@ typedef struct
+   void *owner;
+   int count;
+ } __libc_lock_recursive_t;
++typedef __libc_lock_recursive_t __rtld_lock_recursive_t;
+ 
+ #define __libc_lock_owner_self() ((void *) __hurd_threadvar_location (0))
+ 
+@@ -121,6 +122,8 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
+ 
+ #define __rtld_lock_init_recursive(NAME) \
+   __libc_lock_init_recursive (NAME)
++#define __rtld_lock_initialize(NAME) \
++  (void) ((NAME) = (__rtld_lock_recursive_t) _RTLD_LOCK_RECURSIVE_INITIALIZER
+ #define __rtld_lock_trylock_recursive(NAME) \
+   __libc_lock_trylock_recursive (NAME)
+ #define __rtld_lock_lock_recursive(NAME) \

Modified: glibc-package/branches/eglibc-2.11/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series	2010-01-17 10:25:51 UTC (rev 4088)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series	2010-01-17 17:31:53 UTC (rev 4089)
@@ -101,6 +101,7 @@
 hurd-i386/submitted-SOL_IP.patch
 hurd-i386/local-bigmem.diff
 hurd-i386/local-disable-ioctls.diff
+hurd-i386/submitted-rtld_lock_recursive.diff
 
 ia64/submitted-sysconf.diff
 ia64/submitted-libm.diff


Reply to: