Christian Wiese
13 years ago
6 changed files with 182 additions and 9 deletions
@ -1,8 +1,8 @@
|
||||
# --- 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
|
||||
# Filename: package/.../uclibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
|
||||
# Copyright (C) 2012 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
@ -0,0 +1,50 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
|
||||
# Copyright (C) 2012 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 49f58308779cb0b798f5e7bc902bbc515c1ec394 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Woodward <jason.woodward@timesys.com>
|
||||
Date: Sat, 11 Jun 2011 22:00:59 -0400
|
||||
Subject: [PATCH] Fix e500 __fe_nomask_env use of __set_errno w/o CFLAGS-libm
|
||||
|
||||
Since the new _LIBC guard in 96c9a8f7d00cdf6bb7968a2390b9d87da8a45e2d we need
|
||||
to use CFLAGS-libm (-DNOT_IN_libc -DIS_IN_libm) or we end up with linker
|
||||
errors like:
|
||||
|
||||
lib/libm.a(fe_nomask.os): In function `__fe_nomask_env':
|
||||
fe_nomask.c:(.text+0x26): undefined reference to `__libc_errno'
|
||||
collect2: ld returned 1 exit status
|
||||
|
||||
Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
|
||||
---
|
||||
libm/powerpc/e500/fpu/Makefile.arch | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/libm/powerpc/e500/fpu/Makefile.arch b/libm/powerpc/e500/fpu/Makefile.arch
|
||||
index 904561e..a64843f 100644
|
||||
--- a/libm/powerpc/e500/fpu/Makefile.arch
|
||||
+++ b/libm/powerpc/e500/fpu/Makefile.arch
|
||||
@@ -11,6 +11,8 @@ libm_ARCH_SRC:=$(wildcard $(libm_ARCH_fpu_DIR)/*.c)
|
||||
libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_fpu_DIR)/%.c,$(libm_ARCH_fpu_OUT)/%.o,$(libm_ARCH_SRC))
|
||||
endif
|
||||
|
||||
+CFLAGS-fe_nomask.c := $(CFLAGS-libm)
|
||||
+
|
||||
libm_ARCH_OBJS:=$(libm_ARCH_OBJ)
|
||||
|
||||
ifeq ($(DOPIC),y)
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.32.1-sparc-errno-fix.patch
|
||||
# Copyright (C) 2012 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 ---
|
||||
|
||||
--- uClibc-0.9.32.ori/libc/sysdeps/linux/sparc/pipe.S 2011-06-08 21:35:20.000000000 +0200
|
||||
+++ uClibc-0.9.32/libc/sysdeps/linux/sparc/pipe.S 2011-11-11 15:57:25.000000000 +0100
|
||||
@@ -52,7 +52,7 @@
|
||||
restore %g0,%g0,%o0
|
||||
|
||||
.Lerror:
|
||||
- call HIDDEN_JUMPTARGET(__errno_location)
|
||||
+ call __errno_location
|
||||
or %g0,EINVAL,%i0
|
||||
st %i0,[%o0]
|
||||
ret
|
||||
@ -0,0 +1,98 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../uclibc/uClibc-0.9.32.1-unshare.patch
|
||||
# Copyright (C) 2012 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 ---
|
||||
|
||||
Backport of unshare() syscall.
|
||||
From uClibc git 19dd090a0f68765db87990ef8eda9bf77bb29581
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
---
|
||||
diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/bits/sched.h uClibc-0.9.32/libc/sysdeps/linux/common/bits/sched.h
|
||||
--- uClibc-0.9.32.orig/libc/sysdeps/linux/common/bits/sched.h 2011-12-02 23:54:30.571841170 -0300
|
||||
+++ uClibc-0.9.32/libc/sysdeps/linux/common/bits/sched.h 2011-12-02 23:57:45.874205079 -0300
|
||||
@@ -58,7 +58,13 @@
|
||||
force CLONE_PTRACE on this clone. */
|
||||
# define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in
|
||||
the child. */
|
||||
-# define CLONE_STOPPED 0x02000000 /* Start in stopped state. */
|
||||
+# define CLONE_STOPPED 0x02000000 /* Start in stopped state. */
|
||||
+# define CLONE_NEWUTS 0x04000000 /* New utsname group. */
|
||||
+# define CLONE_NEWIPC 0x08000000 /* New ipcs. */
|
||||
+# define CLONE_NEWUSER 0x10000000 /* New user namespace. */
|
||||
+# define CLONE_NEWPID 0x20000000 /* New pid namespace. */
|
||||
+# define CLONE_NEWNET 0x40000000 /* New network namespace. */
|
||||
+# define CLONE_IO 0x80000000 /* Clone I/O context. */
|
||||
#endif
|
||||
|
||||
/* The official definition. */
|
||||
@@ -74,11 +80,9 @@
|
||||
extern int clone (int (*__fn) (void *__arg), void *__child_stack,
|
||||
int __flags, void *__arg, ...) __THROW;
|
||||
|
||||
-#if 0
|
||||
/* Unshare the specified resources. */
|
||||
extern int unshare (int __flags) __THROW;
|
||||
#endif
|
||||
-#endif
|
||||
|
||||
__END_DECLS
|
||||
|
||||
diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/Makefile.in uClibc-0.9.32/libc/sysdeps/linux/common/Makefile.in
|
||||
--- uClibc-0.9.32.orig/libc/sysdeps/linux/common/Makefile.in 2011-12-02 23:54:30.577841215 -0300
|
||||
+++ uClibc-0.9.32/libc/sysdeps/linux/common/Makefile.in 2011-12-02 23:56:08.801527166 -0300
|
||||
@@ -24,7 +24,8 @@
|
||||
remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \
|
||||
sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \
|
||||
splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
|
||||
- sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c
|
||||
+ sync_file_range.c sysctl.c sysinfo.c timerfd.c unshare.c uselib.c \
|
||||
+ vhangup.c
|
||||
# NPTL needs these internally: madvise.c
|
||||
CSRC-$(findstring y,$(UCLIBC_LINUX_SPECIFIC)$(UCLIBC_HAS_THREADS_NATIVE)) += madvise.c
|
||||
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
|
||||
diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/stubs.c uClibc-0.9.32/libc/sysdeps/linux/common/stubs.c
|
||||
--- uClibc-0.9.32.orig/libc/sysdeps/linux/common/stubs.c 2011-12-02 23:54:30.577841215 -0300
|
||||
+++ uClibc-0.9.32/libc/sysdeps/linux/common/stubs.c 2011-12-02 23:58:18.803435042 -0300
|
||||
@@ -278,6 +278,10 @@
|
||||
make_stub(umount2)
|
||||
#endif
|
||||
|
||||
+#if !defined __NR_unshare && defined __UCLIBC_LINUX_SPECIFIC__
|
||||
+make_stub(unshare)
|
||||
+#endif
|
||||
+
|
||||
#ifndef __NR_utimensat
|
||||
make_stub(futimens)
|
||||
make_stub(utimensat)
|
||||
diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/unshare.c uClibc-0.9.32/libc/sysdeps/linux/common/unshare.c
|
||||
--- uClibc-0.9.32.orig/libc/sysdeps/linux/common/unshare.c 1969-12-31 21:00:00.000000000 -0300
|
||||
+++ uClibc-0.9.32/libc/sysdeps/linux/common/unshare.c 2011-12-02 23:58:42.693601880 -0300
|
||||
@@ -0,0 +1,15 @@
|
||||
+/* vi: set sw=4 ts=4: */
|
||||
+/*
|
||||
+ * unshare() for uClibc
|
||||
+ *
|
||||
+ * Copyright (C) 2011 Henning Heinold <heinold@inf.fu-berlin.de>
|
||||
+ *
|
||||
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
|
||||
+ */
|
||||
+
|
||||
+#include <sys/syscall.h>
|
||||
+#include <sched.h>
|
||||
+
|
||||
+#if defined __NR_unshare
|
||||
+_syscall1(int, unshare, int, flags)
|
||||
+#endif
|
||||
Loading…
Reference in new issue