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

r5012 - in glibc-package/trunk/debian: . patches patches/hurd-i386 patches/kfreebsd



Author: sthibault
Date: 2011-10-28 23:46:30 +0000 (Fri, 28 Oct 2011)
New Revision: 5012

Added:
   glibc-package/trunk/debian/patches/kfreebsd/submitted-libc_once.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_once.diff
   glibc-package/trunk/debian/patches/series
Log:
  * patches/hurd-i386/submitted-libc_once.diff: Move kfreebsd part to
    patches/kfreebsd/submitted-libc_once.diff.


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2011-10-28 23:42:45 UTC (rev 5011)
+++ glibc-package/trunk/debian/changelog	2011-10-28 23:46:30 UTC (rev 5012)
@@ -22,6 +22,8 @@
     tg-tg-regenerate_errno.h.diff, tg-ptrmangle.diff, strtoul_PLT.diff,
     tg-tg-tls.diff, tg-extern_inline.diff, tg-grantpt.diff, check_native.diff,
     tg-tg-____longjmp_chk.diff.
+  * patches/hurd-i386/submitted-libc_once.diff: Move kfreebsd part to
+    patches/kfreebsd/submitted-libc_once.diff.
 
   [ Petr Salinger ]
   * kfreebsd/local-sysdeps.diff: update to revision 3763 (from glibc-bsd).

Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_once.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_once.diff	2011-10-28 23:42:45 UTC (rev 5011)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_once.diff	2011-10-28 23:46:30 UTC (rev 5012)
@@ -1,18 +1,16 @@
 2007-10-28  Aurelien Jarno  <aurelien@aurel32.net>
 
 	* bits/libc-lock.h (__libc_once_get): New definiton.
-	* linuxthreads/sysdeps/pthread/bits/libc-lock.h: Likewise
 	* nptl/sysdeps/pthread/bits/libc-lock.h: Likewise.
 	* sysdeps/mach/bits/libc-lock.h: Likewise.
 	* sysdeps/mach/hurd/bits/libc-lock.h: Likewise.
 	* sysdeps/posix/getaddrinfo.c (getaddrinfo): Use __libc_once_get
 	  instead of using implementational details.
 
-t/libc_once, except the linuxthread/ part, which is for kfreebsd.
+t/libc_once
 
 ---
  bits/libc-lock.h                              |    3 +++
- linuxthreads/sysdeps/pthread/bits/libc-lock.h |    3 +++
  nptl/sysdeps/pthread/bits/libc-lock.h         |    3 +++
  sysdeps/mach/hurd/bits/libc-lock.h            |    4 ++++
  sysdeps/posix/getaddrinfo.c                   |    2 +-
@@ -30,18 +28,6 @@
  
  /* Start a critical region with a cleanup function */
  #define __libc_cleanup_region_start(DOIT, FCT, ARG)			    \
---- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h
-+++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h
-@@ -242,6 +242,9 @@
-     }									      \
-   } while (0)
- 
-+/* Get once control variable.  */
-+#define __libc_once_get(ONCE_CONTROL) \
-+  ((ONCE_CONTROL) != PTHREAD_ONCE_INIT)
- 
- /* Start critical region with cleanup.  */
- #define __libc_cleanup_region_start(DOIT, FCT, ARG) \
 --- a/nptl/sysdeps/pthread/bits/libc-lock.h
 +++ b/nptl/sysdeps/pthread/bits/libc-lock.h
 @@ -451,6 +451,9 @@

Added: glibc-package/trunk/debian/patches/kfreebsd/submitted-libc_once.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/submitted-libc_once.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/kfreebsd/submitted-libc_once.diff	2011-10-28 23:46:30 UTC (rev 5012)
@@ -0,0 +1,21 @@
+2007-10-28  Aurelien Jarno  <aurelien@aurel32.net>
+
+        * linuxthreads/sysdeps/pthread/bits/libc-lock.h (__libc_once_get): New
+        definition.
+
+---
+ libc-lock.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h
++++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h
+@@ -242,6 +242,9 @@
+     }									      \
+   } while (0)
+ 
++/* Get once control variable.  */
++#define __libc_once_get(ONCE_CONTROL) \
++  ((ONCE_CONTROL) != PTHREAD_ONCE_INIT)
+ 
+ /* Start critical region with cleanup.  */
+ #define __libc_cleanup_region_start(DOIT, FCT, ARG) \

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series	2011-10-28 23:42:45 UTC (rev 5011)
+++ glibc-package/trunk/debian/patches/series	2011-10-28 23:46:30 UTC (rev 5012)
@@ -157,6 +157,8 @@
 hurd-i386/cvs-fork_ports.diff
 hurd-i386/submitted-setresid.diff
 
+kfreebsd/submitted-libc_once.diff
+
 ia64/local-dlfptr.diff
 ia64/submitted-sysconf.diff
 ia64/submitted-libm.diff


Reply to: