[glibc] 01/02: debian/patches/kfreebsd/local-sysdeps.diff: update to revision 6087 (from glibc-bsd).
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.24
in repository glibc.
commit 139f4ee0e2c6647dc3508f61b45108bbb98dc5ea
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri Jul 8 12:16:46 2016 +0200
debian/patches/kfreebsd/local-sysdeps.diff: update to revision 6087 (from glibc-bsd).
---
debian/changelog | 2 +-
debian/patches/kfreebsd/local-sysdeps.diff | 52 ++++++++++++++++++++++--------
2 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c1fc3d..bd2cdfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ glibc (2.23.90+20160507.87523e9-2) UNRELEASED; urgency=medium
* debian/testsuite-xfail-debian.mk: do not allow math/test-fenv to
fail now that we do not have Loongson 2 buildds anymore.
* debian/patches/kfreebsd/local-sysdeps.diff, local-fbtl.diff:
- update to revision 6083 (from glibc-bsd).
+ update to revision 6087 (from glibc-bsd).
* debian/testsuite-xfail-debian.mk: allow more failures on kfreebsd-*,
mostly due to the fsid_t type, and which are not regressions.
diff --git a/debian/patches/kfreebsd/local-sysdeps.diff b/debian/patches/kfreebsd/local-sysdeps.diff
index 9d8a6d4..1f27395 100644
--- a/debian/patches/kfreebsd/local-sysdeps.diff
+++ b/debian/patches/kfreebsd/local-sysdeps.diff
@@ -2933,7 +2933,7 @@
+#define SIG_SETMASK 3 /* Set the set of blocked signals. */
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/siginfo.h
-@@ -0,0 +1,276 @@
+@@ -0,0 +1,282 @@
+/* siginfo_t, sigevent and constants. FreeBSD version.
+ Copyright (C) 1997-1998, 2000-2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -3170,6 +3170,12 @@
+
+#include <sys/_types.h> /* __lwpid_t */
+
++/* Forward declaration. */
++# ifndef __have_pthread_attr_t
++typedef union pthread_attr_t pthread_attr_t;
++# define __have_pthread_attr_t 1
++# endif
++
+/* Structure to transport application-defined values with signals. */
+
+typedef struct sigevent
@@ -3182,16 +3188,16 @@
+ __lwpid_t threadid;
+ struct
+ {
-+ void (*function) (sigval_t); /* Function to start. */
-+ void *attributes; /* Really pthread_attr_t. */
-+ } thread;
-+ } un;
++ void (*_function) (sigval_t); /* Function to start. */
++ pthread_attr_t *_attribute; /* Really pthread_attr_t. */
++ } _sigev_thread;
++ } _sigev_un;
+ } sigevent_t;
+
+#define sigev_notify_kqueue sigev_signo
-+#define sigev_notify_function un.thread.function
-+#define sigev_notify_attributes un.thread.attributes
-+#define sigev_notify_thread_id un.threadid
++#define sigev_notify_function _sigev_un._sigev_thread._function
++#define sigev_notify_attributes _sigev_un._sigev_thread._attribute
++#define sigev_notify_thread_id _sigev_un.threadid
+
+/* `sigev_notify' values. */
+enum
@@ -4421,7 +4427,7 @@
+#endif /* bits/syslog-path.h */
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/termios.h
-@@ -0,0 +1,245 @@
+@@ -0,0 +1,263 @@
+/* termios type and macro definitions. FreeBSD version.
+ Copyright (C) 1993-1994,1996-1997,1999,2001-2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -4539,11 +4545,29 @@
+#define OPOST (1 << 0) /* Perform output processing. */
+#define ONLCR (1 << 1) /* Map NL to CR-NL on output. */
+#if defined __USE_MISC || defined __USE_XOPEN
-+# define TAB0 (0 << 2) /* no tab delay and expansion */
-+# define TAB3 (1 << 2) /* expand tabs to spaces */
-+# define TABDLY TAB3 /* tab delay mask */
-+# define OXTABS TAB3
-+# define XTABS TAB3
++# define NLDLY 0x00000300 /* \n delay */
++# define NL0 0x00000000
++# define NL1 0x00000100 /* tty 37 */
++# define NL2 0x00000200 /* vt05 */
++# define NL3 0x00000300
++# define TABDLY 0x00000c00 /* horizontal tab delay */
++# define TAB0 0x00000000
++# define TAB1 0x00000400 /* tty 37 */
++# define TAB2 0x00000800
++# define CRDLY 0x00003000 /* \r delay */
++# define CR0 0x00000000
++# define CR1 0x00001000 /* tn 300 */
++# define CR2 0x00002000 /* tty 37 */
++# define CR3 0x00003000 /* concept 100 */
++# define FFDLY 0x00004000 /* vertical tab delay */
++# define FF0 0x00000000
++# define FF1 0x00004000 /* tty 37 */
++# define BSDLY 0x00008000 /* \b delay */
++# define BS0 0x00000000
++# define BS1 0x00008000
++#endif
++#ifdef __USE_MISC
++# define XTABS 0x00000c00 /* expand tabs on output */
+#endif
+#ifdef __USE_MISC
+# define ONOEOT (1 << 3) /* Discard EOT (^D) on output. */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: