diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
| commit | 27537f0ac386cd2d869a73d2c4d432be2dffb9eb (patch) | |
| tree | 8d0d6a6026aa6c0a7b5bbd777ef9ed65f916fa78 /toolchain/uClibc | |
| parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
| parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) | |
resolve xterm Makefile conflict
Diffstat (limited to 'toolchain/uClibc')
| -rw-r--r-- | toolchain/uClibc/patches/revert-vfork.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/toolchain/uClibc/patches/revert-vfork.patch b/toolchain/uClibc/patches/revert-vfork.patch deleted file mode 100644 index 29073c123..000000000 --- a/toolchain/uClibc/patches/revert-vfork.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nur uClibc-0.9.32-rc1.orig/libc/sysdeps/linux/common/vfork.c uClibc-0.9.32-rc1/libc/sysdeps/linux/common/vfork.c ---- uClibc-0.9.32-rc1.orig/libc/sysdeps/linux/common/vfork.c 2010-12-17 20:05:17.000000000 +0100 -+++ uClibc-0.9.32-rc1/libc/sysdeps/linux/common/vfork.c 2010-12-31 14:28:19.259431750 +0100 -@@ -4,30 +4,24 @@ - * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - */ - -+/* Trivial implementation for arches that lack vfork */ - #include <unistd.h> - #include <sys/types.h> - #include <sys/syscall.h> - --extern __typeof(vfork) __vfork attribute_hidden; -- --#ifdef __NR_vfork -- --# define __NR___vfork __NR_vfork --_syscall0(pid_t, __vfork) -- --weak_alias(__vfork,vfork) --libc_hidden_weak(vfork) -- --#elif defined __ARCH_USE_MMU__ && defined __NR_fork -+#ifdef __ARCH_USE_MMU__ - --/* Trivial implementation for arches that lack vfork */ -+#ifdef __NR_fork -+/* libc_hidden_proto(fork) */ - -+extern __typeof(vfork) __vfork attribute_hidden; - pid_t __vfork(void) - { - return fork(); - } -- -+/* libc_hidden_proto(vfork) */ - weak_alias(__vfork,vfork) - libc_hidden_weak(vfork) -+#endif - - #endif |