From f2cb3292552ae4c103f393727e1ff3620996d903 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 22 Feb 2006 03:32:04 +0000
Subject: sync with glibc

---
 include/sys/epoll.h       |  9 ++++++---
 ldso/include/dl-defs.h    | 16 ++++++++++++++++
 test/unistd/clone_cruft.h |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/include/sys/epoll.h b/include/sys/epoll.h
index 6c310bcff..68f173a04 100644
--- a/include/sys/epoll.h
+++ b/include/sys/epoll.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -98,9 +98,12 @@ extern int epoll_ctl (int __epfd, int __op, int __fd,
    "events" parameter is a buffer that will contain triggered
    events. The "maxevents" is the maximum number of events to be
    returned ( usually size of "events" ). The "timeout" parameter
-   specifies the maximum wait time in milliseconds (-1 == infinite).  */
+   specifies the maximum wait time in milliseconds (-1 == infinite).
+
+   This function is a cancellation point and therefore not marked with
+   __THROW.  */
 extern int epoll_wait (int __epfd, struct epoll_event *__events,
-		       int __maxevents, int __timeout) __THROW;
+		       int __maxevents, int __timeout);
 
 __END_DECLS
 
diff --git a/ldso/include/dl-defs.h b/ldso/include/dl-defs.h
index 789413c4f..878ebc3b8 100644
--- a/ldso/include/dl-defs.h
+++ b/ldso/include/dl-defs.h
@@ -8,6 +8,22 @@
 #ifndef _LD_DEFS_H
 #define _LD_DEFS_H
 
+#define FLAG_ANY             -1
+#define FLAG_TYPE_MASK       0x00ff
+#define FLAG_LIBC4           0x0000
+#define FLAG_ELF             0x0001
+#define FLAG_ELF_LIBC5       0x0002
+#define FLAG_ELF_LIBC6       0x0003
+#define FLAG_ELF_UCLIBC      0x0004
+#define FLAG_REQUIRED_MASK   0xff00
+#define FLAG_SPARC_LIB64     0x0100
+#define FLAG_IA64_LIB64      0x0200
+#define FLAG_X8664_LIB64     0x0300
+#define FLAG_S390_LIB64      0x0400
+#define FLAG_POWERPC_LIB64   0x0500
+#define FLAG_MIPS64_LIBN32   0x0600
+#define FLAG_MIPS64_LIBN64   0x0700
+
 #define LIB_ANY	     -1
 #define LIB_DLL       0
 #define LIB_ELF       1
diff --git a/test/unistd/clone_cruft.h b/test/unistd/clone_cruft.h
index b6a395d06..ec4887aaf 100644
--- a/test/unistd/clone_cruft.h
+++ b/test/unistd/clone_cruft.h
@@ -9,7 +9,7 @@
 extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base,
                      size_t __child_stack_size, int __flags, void *__arg, ...);
 # define do_clone(fn, stack, flags, arg) \
-	__clone2(fn, stack, crappy_sizeof(stack), flags, arg, NULL, NULL, NULL)
+	clone2(fn, stack, crappy_sizeof(stack), flags, arg, NULL, NULL, NULL)
 
 #elif defined __hppa__
 
-- 
cgit v1.2.3