diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 16:48:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 16:48:45 +0100 |
| commit | 38136c7702e1940a88f24d09141f07b23b966a1c (patch) | |
| tree | b1ba1e95441ce11b8ed84dc3810c7481df26ef92 /toolchain/uClibc/patches/revert-vfork.patch | |
| parent | 50e7ffe10d0bca1ef5b2d27ebc518b456035a18d (diff) | |
| parent | 2dce122bacb8837543ff8e882a1df7284324e357 (diff) | |
resolve conflict
Diffstat (limited to 'toolchain/uClibc/patches/revert-vfork.patch')
| -rw-r--r-- | toolchain/uClibc/patches/revert-vfork.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches/revert-vfork.patch b/toolchain/uClibc/patches/revert-vfork.patch new file mode 100644 index 000000000..29073c123 --- /dev/null +++ b/toolchain/uClibc/patches/revert-vfork.patch @@ -0,0 +1,41 @@ +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 |