r1656 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/patches/kfreebsd trunk/debian trunk/debian/patches/kfreebsd
Author: aurel32
Date: 2006-06-13 17:36:31 +0000 (Tue, 13 Jun 2006)
New Revision: 1656
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* patches/kfreebsd/local-sysdeps.diff: update to revision 1592 (from glibc-bsd).
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-13 17:27:54 UTC (rev 1655)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-13 17:36:31 UTC (rev 1656)
@@ -153,6 +153,7 @@
determine if the host CPU is able to run the testsuite.
* debian/sysdeps/kfreebsd.mk: also use the nfs/ directory from kernel
headers.
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 1592 (from glibc-bsd).
[ Denis Barbier ]
* debian/control.in/main: also make locales Conflicts: belocs-locales-bin.
Modified: glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff 2006-06-13 17:27:54 UTC (rev 1655)
+++ glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff 2006-06-13 17:36:31 UTC (rev 1656)
@@ -3991,10 +3991,10 @@
+# define CLONE_FS 0x00000200 /* Set if fs info shared between processes. */
+# define CLONE_FILES 0x00000400 /* Set if open files shared between processes. */
+# define CLONE_SIGHAND 0x00000800 /* Set if signal handlers shared. */
-+# define CLONE_PID 0x00001000 /* Set if pid shared. */
+# define CLONE_PTRACE 0x00002000 /* Set if tracing continues on the child. */
+# define CLONE_VFORK 0x00004000 /* Set if the parent wants the child to
+ wake it up on mm_release. */
++# define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */
+#endif
+
+__BEGIN_DECLS
@@ -6215,7 +6215,7 @@
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/clone.c sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c
--- null/unix/bsd/bsd4.4/kfreebsd/clone.c 1970-01-01 01:00:00.000000000 +0100
+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c 2006-01-02 19:10:55.000000000 +0100
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,105 @@
+/* Create a thread.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -6274,7 +6274,7 @@
+
+ /* This implementation of clone() does not support all Linux flags. */
+ if (flags & ~(CSIGNAL | CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND
-+ | CLONE_VFORK))
++ | CLONE_VFORK | CLONE_SYSVSEM))
+ {
+ __set_errno (EINVAL);
+ return -1;
@@ -6299,6 +6299,10 @@
+ will set their umask and cwd before spawning threads. */
+ ;
+
++ if (flags & CLONE_SYSVSEM)
++ /* Ignore this; it has been introduced into linuxthreads in post 2.4 glibc */
++ ;
++
+ if (!(flags & CLONE_FILES))
+ rfork_flags |= RFFDG;
+
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-13 17:27:54 UTC (rev 1655)
+++ glibc-package/trunk/debian/changelog 2006-06-13 17:36:31 UTC (rev 1656)
@@ -11,6 +11,7 @@
determine if the host CPU is able to run the testsuite.
* debian/sysdeps/kfreebsd.mk: also use the nfs/ directory from kernel
headers.
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 1592 (from glibc-bsd).
[ Denis Barbier ]
* debian/main/control.in: also make locales Conflicts: belocs-locales-bin.
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2006-06-13 17:27:54 UTC (rev 1655)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2006-06-13 17:36:31 UTC (rev 1656)
@@ -3991,10 +3991,10 @@
+# define CLONE_FS 0x00000200 /* Set if fs info shared between processes. */
+# define CLONE_FILES 0x00000400 /* Set if open files shared between processes. */
+# define CLONE_SIGHAND 0x00000800 /* Set if signal handlers shared. */
-+# define CLONE_PID 0x00001000 /* Set if pid shared. */
+# define CLONE_PTRACE 0x00002000 /* Set if tracing continues on the child. */
+# define CLONE_VFORK 0x00004000 /* Set if the parent wants the child to
+ wake it up on mm_release. */
++# define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */
+#endif
+
+__BEGIN_DECLS
@@ -6215,7 +6215,7 @@
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/clone.c sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c
--- null/unix/bsd/bsd4.4/kfreebsd/clone.c 1970-01-01 01:00:00.000000000 +0100
+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c 2006-01-02 19:10:55.000000000 +0100
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,105 @@
+/* Create a thread.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -6274,7 +6274,7 @@
+
+ /* This implementation of clone() does not support all Linux flags. */
+ if (flags & ~(CSIGNAL | CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND
-+ | CLONE_VFORK))
++ | CLONE_VFORK | CLONE_SYSVSEM))
+ {
+ __set_errno (EINVAL);
+ return -1;
@@ -6299,6 +6299,10 @@
+ will set their umask and cwd before spawning threads. */
+ ;
+
++ if (flags & CLONE_SYSVSEM)
++ /* Ignore this; it has been introduced into linuxthreads in post 2.4 glibc */
++ ;
++
+ if (!(flags & CLONE_FILES))
+ rfork_flags |= RFFDG;
+
Reply to: