Christian Wiese
14 years ago
11 changed files with 63 additions and 7870 deletions
@ -1,80 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.31.1-add-inotify-init1.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From a2e5630af426f85fdd8721b2820786d9bd2aa695 Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Zapolskiy <vzapolskiy@gmail.com>
|
||||
Date: Tue, 1 Jun 2010 20:02:54 +0400
|
||||
Subject: [PATCH] inotify: add inotify_init1 system call support
|
||||
|
||||
This patch introduces support for inotify_init1 system call, found
|
||||
since Linux 2.6.27.
|
||||
|
||||
Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
libc/sysdeps/linux/common/inotify.c | 4 ++++
|
||||
libc/sysdeps/linux/common/sys/inotify.h | 13 +++++++++++++
|
||||
2 files changed, 17 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/libc/sysdeps/linux/common/inotify.c b/libc/sysdeps/linux/common/inotify.c
|
||||
index e5a6120..e35f043 100644
|
||||
--- a/libc/sysdeps/linux/common/inotify.c
|
||||
+++ b/libc/sysdeps/linux/common/inotify.c
|
||||
@@ -15,6 +15,10 @@
|
||||
_syscall0(int, inotify_init)
|
||||
#endif
|
||||
|
||||
+#ifdef __NR_inotify_init1
|
||||
+_syscall1(int, inotify_init1, int, flags)
|
||||
+#endif
|
||||
+
|
||||
#ifdef __NR_inotify_add_watch
|
||||
_syscall3(int, inotify_add_watch, int, fd, const char *, path, uint32_t, mask)
|
||||
#endif
|
||||
diff --git a/libc/sysdeps/linux/common/sys/inotify.h b/libc/sysdeps/linux/common/sys/inotify.h
|
||||
index 0131db9..dc4e19d 100644
|
||||
--- a/libc/sysdeps/linux/common/sys/inotify.h
|
||||
+++ b/libc/sysdeps/linux/common/sys/inotify.h
|
||||
@@ -22,6 +22,16 @@
|
||||
#include <stdint.h>
|
||||
|
||||
|
||||
+/* Flags for the parameter of inotify_init1. */
|
||||
+enum
|
||||
+ {
|
||||
+ IN_CLOEXEC = 02000000,
|
||||
+#define IN_CLOEXEC IN_CLOEXEC
|
||||
+ IN_NONBLOCK = 04000
|
||||
+#define IN_NONBLOCK IN_NONBLOCK
|
||||
+ };
|
||||
+
|
||||
+
|
||||
/* Structure describing an inotify event. */
|
||||
struct inotify_event
|
||||
{
|
||||
@@ -79,6 +89,9 @@ __BEGIN_DECLS
|
||||
/* Create and initialize inotify instance. */
|
||||
extern int inotify_init (void) __THROW;
|
||||
|
||||
+/* Create and initialize inotify instance. */
|
||||
+extern int inotify_init1 (int __flags) __THROW;
|
||||
+
|
||||
/* Add watch of object NAME to inotify instance FD. Notify about
|
||||
events specified by MASK. */
|
||||
extern int inotify_add_watch (int __fd, const char *__name, uint32_t __mask)
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.31.1-add-sock-cloexec.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From 83333e9c873e4eca6b2c945f7770b1f5373b0427 Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Zapolskiy <vzapolskiy@gmail.com>
|
||||
Date: Tue, 1 Jun 2010 20:02:39 +0400
|
||||
Subject: [PATCH] bits/socket.h: add SOCK_CLOEXEC and SOCK_NONBLOCK support
|
||||
|
||||
This patch adds support for SOCK_CLOEXEC and SOCK_NONBLOCK socket
|
||||
descriptor flags, which are introduced since Linux 2.6.27
|
||||
|
||||
Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
libc/sysdeps/linux/common/bits/socket.h | 12 +++++++++++-
|
||||
1 files changed, 11 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
|
||||
index ac5a433..11f6e97 100644
|
||||
--- a/libc/sysdeps/linux/common/bits/socket.h
|
||||
+++ b/libc/sysdeps/linux/common/bits/socket.h
|
||||
@@ -53,10 +53,20 @@ enum __socket_type
|
||||
SOCK_SEQPACKET = 5, /* Sequenced, reliable, connection-based,
|
||||
datagrams of fixed maximum length. */
|
||||
#define SOCK_SEQPACKET SOCK_SEQPACKET
|
||||
- SOCK_PACKET = 10 /* Linux specific way of getting packets
|
||||
+ SOCK_PACKET = 10, /* Linux specific way of getting packets
|
||||
at the dev level. For writing rarp and
|
||||
other similar things on the user level. */
|
||||
#define SOCK_PACKET SOCK_PACKET
|
||||
+
|
||||
+ /* Flags to be ORed into the type parameter of socket and socketpair and
|
||||
+ used for the flags parameter of paccept. */
|
||||
+
|
||||
+ SOCK_CLOEXEC = 02000000, /* Atomically set close-on-exec flag for the
|
||||
+ new descriptor(s). */
|
||||
+#define SOCK_CLOEXEC SOCK_CLOEXEC
|
||||
+ SOCK_NONBLOCK = 04000 /* Atomically mark descriptor(s) as
|
||||
+ non-blocking. */
|
||||
+#define SOCK_NONBLOCK SOCK_NONBLOCK
|
||||
};
|
||||
|
||||
/* Protocol families. */
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.31.1-fix-error-locale-utf-8.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
---
|
||||
extra/locale/gen_wc8bit.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: uClibc-0.9.31/extra/locale/gen_wc8bit.c
|
||||
===================================================================
|
||||
--- uClibc-0.9.31.orig/extra/locale/gen_wc8bit.c
|
||||
+++ uClibc-0.9.31/extra/locale/gen_wc8bit.c
|
||||
@@ -120,7 +120,7 @@
|
||||
}
|
||||
|
||||
locale_failure:
|
||||
- printf("could not find a UTF8 locale ... please enable en_US.UTF-8\n");
|
||||
+ fprintf(stderr, "could not find a UTF8 locale ... please enable en_US.UTF-8\n");
|
||||
return EXIT_FAILURE;
|
||||
locale_success:
|
||||
pclose(fp);
|
||||
@ -1,50 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.31.1-fix-fcntl64-for-64-bit-targets.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From 6f1daaaf2d94c1e6184add44eda38b0781b88cf0 Mon Sep 17 00:00:00 2001
|
||||
From: Rob Landley <rob@landley.net>
|
||||
Date: Sun, 16 May 2010 21:41:36 +0000
|
||||
Subject: Fix fcntl64 for 64 bit targets.
|
||||
|
||||
64 bit targets often don't have a separate fcntl64() system call, because they don't need one.
|
||||
|
||||
Signed-off-by: Rob Landley <rob@landley.net>
|
||||
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
|
||||
---
|
||||
diff --git a/include/fcntl.h b/include/fcntl.h
|
||||
index e37073f..3cfb25f 100644
|
||||
--- a/include/fcntl.h
|
||||
+++ b/include/fcntl.h
|
||||
@@ -73,7 +73,7 @@ __BEGIN_DECLS
|
||||
|
||||
This function is a cancellation point and therefore not marked with
|
||||
__THROW. */
|
||||
-#ifndef __USE_FILE_OFFSET64
|
||||
+#if !defined(__USE_FILE_OFFSET64) || defined(__LP64__)
|
||||
extern int fcntl (int __fd, int __cmd, ...);
|
||||
libc_hidden_proto(fcntl)
|
||||
#else
|
||||
@@ -83,7 +83,7 @@ extern int __REDIRECT (fcntl, (int __fd, int __cmd, ...), fcntl64);
|
||||
# define fcntl fcntl64
|
||||
# endif
|
||||
#endif
|
||||
-#ifdef __USE_LARGEFILE64
|
||||
+#if defined(__USE_LARGEFILE64) && !defined(__LP64__)
|
||||
extern int fcntl64 (int __fd, int __cmd, ...);
|
||||
libc_hidden_proto(fcntl64)
|
||||
#endif
|
||||
--
|
||||
cgit v0.8.2.1
|
||||
@ -1,56 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.31.1-more-workarounds-GCC-PR32219.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From aa67771881d65373da448ad5f7a8393f3a1d9469 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
|
||||
Date: Wed, 30 Jun 2010 14:46:37 +0300
|
||||
Subject: [PATCH] more workarounds for GCC PR32219
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Commit 2e53dd645d5348f207cec7f8595969dc566c5a55 workarounds GCC
|
||||
bug when accessing _locale_init and _stdio_init. We need the same
|
||||
fix for __errno_location and __h_errno_location otherwise we crash
|
||||
calling null with static and non-threaded builds.
|
||||
|
||||
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
|
||||
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
||||
---
|
||||
libc/misc/internals/__uClibc_main.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
|
||||
index 3f09ad2..58f6643 100644
|
||||
--- a/libc/misc/internals/__uClibc_main.c
|
||||
+++ b/libc/misc/internals/__uClibc_main.c
|
||||
@@ -447,11 +447,11 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
|
||||
* have resulted in errno being set nonzero, so set it to 0 before
|
||||
* we call main.
|
||||
*/
|
||||
- if (likely(__errno_location!=NULL))
|
||||
+ if (likely(not_null_ptr(__errno_location)))
|
||||
*(__errno_location()) = 0;
|
||||
|
||||
/* Set h_errno to 0 as well */
|
||||
- if (likely(__h_errno_location!=NULL))
|
||||
+ if (likely(not_null_ptr(__h_errno_location)))
|
||||
*(__h_errno_location()) = 0;
|
||||
|
||||
#if defined HAVE_CLEANUP_JMP_BUF && defined __UCLIBC_HAS_THREADS_NATIVE__
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.31.1-powerpc-ptrace-fix.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
[PATCH] powerpc: add PTRACE_EVENT_ defines needed by ltrace
|
||||
|
||||
Equivalent to the common version and kernel headers.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
|
||||
---
|
||||
libc/sysdeps/linux/powerpc/sys/ptrace.h | 41 +++++++++++++++++++++++++++++++-
|
||||
1 file changed, 40 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: uClibc-0.9.31/libc/sysdeps/linux/powerpc/sys/ptrace.h
|
||||
===================================================================
|
||||
--- uClibc-0.9.31.orig/libc/sysdeps/linux/powerpc/sys/ptrace.h
|
||||
+++ uClibc-0.9.31/libc/sysdeps/linux/powerpc/sys/ptrace.h
|
||||
@@ -79,8 +79,47 @@ enum __ptrace_request
|
||||
#define PT_DETACH PTRACE_DETACH
|
||||
|
||||
/* Continue and stop at the next (return from) syscall. */
|
||||
- PTRACE_SYSCALL = 24
|
||||
+ PTRACE_SYSCALL = 24,
|
||||
#define PT_SYSCALL PTRACE_SYSCALL
|
||||
+
|
||||
+ /* Set ptrace filter options. */
|
||||
+ PTRACE_SETOPTIONS = 0x4200,
|
||||
+#define PT_SETOPTIONS PTRACE_SETOPTIONS
|
||||
+
|
||||
+ /* Get last ptrace message. */
|
||||
+ PTRACE_GETEVENTMSG = 0x4201,
|
||||
+#define PT_GETEVENTMSG PTRACE_GETEVENTMSG
|
||||
+
|
||||
+ /* Get siginfo for process. */
|
||||
+ PTRACE_GETSIGINFO = 0x4202,
|
||||
+#define PT_GETSIGINFO PTRACE_GETSIGINFO
|
||||
+
|
||||
+ /* Set new siginfo for process. */
|
||||
+ PTRACE_SETSIGINFO = 0x4203
|
||||
+#define PT_SETSIGINFO PTRACE_SETSIGINFO
|
||||
+};
|
||||
+
|
||||
+
|
||||
+/* Options set using PTRACE_SETOPTIONS. */
|
||||
+enum __ptrace_setoptions {
|
||||
+ PTRACE_O_TRACESYSGOOD = 0x00000001,
|
||||
+ PTRACE_O_TRACEFORK = 0x00000002,
|
||||
+ PTRACE_O_TRACEVFORK = 0x00000004,
|
||||
+ PTRACE_O_TRACECLONE = 0x00000008,
|
||||
+ PTRACE_O_TRACEEXEC = 0x00000010,
|
||||
+ PTRACE_O_TRACEVFORKDONE = 0x00000020,
|
||||
+ PTRACE_O_TRACEEXIT = 0x00000040,
|
||||
+ PTRACE_O_MASK = 0x0000007f
|
||||
+};
|
||||
+
|
||||
+/* Wait extended result codes for the above trace options. */
|
||||
+enum __ptrace_eventcodes {
|
||||
+ PTRACE_EVENT_FORK = 1,
|
||||
+ PTRACE_EVENT_VFORK = 2,
|
||||
+ PTRACE_EVENT_CLONE = 3,
|
||||
+ PTRACE_EVENT_EXEC = 4,
|
||||
+ PTRACE_EVENT_VFORK_DONE = 5,
|
||||
+ PTRACE_EVENT_EXIT = 6
|
||||
};
|
||||
|
||||
/* Perform process tracing functions. REQUEST is one of the values
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,73 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.31.1-workaround-GCC-PR32219.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From 2e53dd645d5348f207cec7f8595969dc566c5a55 Mon Sep 17 00:00:00 2001
|
||||
From: Denys Vlasenko <vda.linux@googlemail.com>
|
||||
Date: Mon, 17 May 2010 15:56:19 +0200
|
||||
Subject: [PATCH] workaround GCC PR32219
|
||||
|
||||
we ended up calling 0
|
||||
Fixes bug #1033
|
||||
|
||||
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
||||
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
||||
---
|
||||
libc/misc/internals/__uClibc_main.c | 15 +++++++++++++--
|
||||
1 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
|
||||
index f9e1244..4ee4443 100644
|
||||
--- a/libc/misc/internals/__uClibc_main.c
|
||||
+++ b/libc/misc/internals/__uClibc_main.c
|
||||
@@ -105,6 +105,17 @@ _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer,
|
||||
|
||||
#endif /* !SHARED */
|
||||
|
||||
+/* Defeat compiler optimization which assumes function addresses are never NULL */
|
||||
+static __always_inline int not_null_ptr(const void *p)
|
||||
+{
|
||||
+ const void *q;
|
||||
+ __asm__ (""
|
||||
+ : "=r" (q) /* output */
|
||||
+ : "0" (p) /* input */
|
||||
+ );
|
||||
+ return q != 0;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* Prototypes.
|
||||
*/
|
||||
@@ -254,7 +265,7 @@ void __uClibc_init(void)
|
||||
|
||||
#ifdef __UCLIBC_HAS_LOCALE__
|
||||
/* Initialize the global locale structure. */
|
||||
- if (likely(_locale_init!=NULL))
|
||||
+ if (likely(not_null_ptr(_locale_init)))
|
||||
_locale_init();
|
||||
#endif
|
||||
|
||||
@@ -264,7 +275,7 @@ void __uClibc_init(void)
|
||||
* Thus we get a nice size savings because the stdio functions
|
||||
* won't be pulled into the final static binary unless used.
|
||||
*/
|
||||
- if (likely(_stdio_init != NULL))
|
||||
+ if (likely(not_null_ptr(_stdio_init)))
|
||||
_stdio_init();
|
||||
|
||||
}
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.32-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From 8245f3b4638fdff2011c2657af1bb211def704bc Mon Sep 17 00:00:00 2001
|
||||
From: Phil Blundell <pb@pbcl.net>
|
||||
Date: Sat, 11 Jun 2011 01:10:46 -0400
|
||||
Subject: [PATCH] Fix __libc_epoll_pwait compile failure on x86
|
||||
|
||||
This prevents "memory input 7 is not directly addressable" errors.
|
||||
|
||||
| libc/sysdeps/linux/common/epoll.c: In function '__libc_epoll_pwait':
|
||||
| libc/sysdeps/linux/common/epoll.c:71:80: error: memory input 7 is not directly addressable
|
||||
| libc/sysdeps/linux/common/epoll.c:75:86: error: memory input 7 is not directly addressable
|
||||
| make: *** [libc/sysdeps/linux/common/epoll.o] Error 1
|
||||
| make: *** Waiting for unfinished jobs....
|
||||
|
||||
Signed-off-by: Phil Blundell <pb@pbcl.net>
|
||||
Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
libc/sysdeps/linux/common/epoll.c | 5 +++--
|
||||
1 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
|
||||
index 85b0cfd..ab3e73b 100644
|
||||
--- a/libc/sysdeps/linux/common/epoll.c
|
||||
+++ b/libc/sysdeps/linux/common/epoll.c
|
||||
@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait;
|
||||
int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
|
||||
int timeout, const sigset_t *set)
|
||||
{
|
||||
+ int nsig = _NSIG / 8;
|
||||
if (SINGLE_THREAD_P)
|
||||
- return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
|
||||
+ return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
|
||||
# ifdef __UCLIBC_HAS_THREADS_NATIVE__
|
||||
else {
|
||||
int oldtype = LIBC_CANCEL_ASYNC ();
|
||||
- int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
|
||||
+ int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
|
||||
LIBC_CANCEL_RESET (oldtype);
|
||||
return result;
|
||||
}
|
||||
--
|
||||
1.7.5.4
|
||||
|
||||
Loading…
Reference in new issue