[aadk-commits] qwell: branch toolchain/upstreamsync r262 - in /toolchain/branches/upstreamsy...

[aadk-commits at lists.digium.com]

Author: qwell
Date: Tue Mar 27 12:51:34 2007
New Revision: 262

URL: http://svn.digium.com/view/aadk?view=rev&rev=262
Log:
Merge our changes into upstream branch

Modified:
    toolchain/branches/upstreamsync/uClibc/extra/Configs/Config.bfin.default
    toolchain/branches/upstreamsync/uClibc/extra/Configs/Config.bfinfdpic.default
    toolchain/branches/upstreamsync/uClibc/libc/sysdeps/linux/common/bits/dlfcn.h
    toolchain/branches/upstreamsync/uClibc/libc/unistd/Makefile.in
    toolchain/branches/upstreamsync/uClibc/libc/unistd/daemon.c

Modified: toolchain/branches/upstreamsync/uClibc/extra/Configs/Config.bfin.default
URL: http://svn.digium.com/view/aadk/toolchain/branches/upstreamsync/uClibc/extra/Configs/Config.bfin.default?view=diff&rev=262&r1=261&r2=262
==============================================================================
--- toolchain/branches/upstreamsync/uClibc/extra/Configs/Config.bfin.default (original)
+++ toolchain/branches/upstreamsync/uClibc/extra/Configs/Config.bfin.default Tue Mar 27 12:51:34 2007
@@ -141,7 +141,7 @@
 # UCLIBC_HAS_WORDEXP is not set
 # UCLIBC_HAS_FTW is not set
 UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
+UCLIBC_HAS_GNU_GLOB=y
 
 #
 # Library Installation Options

Modified: toolchain/branches/upstreamsync/uClibc/extra/Configs/Config.bfinfdpic.default
URL: http://svn.digium.com/view/aadk/toolchain/branches/upstreamsync/uClibc/extra/Configs/Config.bfinfdpic.default?view=diff&rev=262&r1=261&r2=262
==============================================================================
--- toolchain/branches/upstreamsync/uClibc/extra/Configs/Config.bfinfdpic.default (original)
+++ toolchain/branches/upstreamsync/uClibc/extra/Configs/Config.bfinfdpic.default Tue Mar 27 12:51:34 2007
@@ -148,7 +148,7 @@
 # UCLIBC_HAS_WORDEXP is not set
 # UCLIBC_HAS_FTW is not set
 UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
+UCLIBC_HAS_GNU_GLOB=y
 
 #
 # Library Installation Options

Modified: toolchain/branches/upstreamsync/uClibc/libc/sysdeps/linux/common/bits/dlfcn.h
URL: http://svn.digium.com/view/aadk/toolchain/branches/upstreamsync/uClibc/libc/sysdeps/linux/common/bits/dlfcn.h?view=diff&rev=262&r1=261&r2=262
==============================================================================
--- toolchain/branches/upstreamsync/uClibc/libc/sysdeps/linux/common/bits/dlfcn.h (original)
+++ toolchain/branches/upstreamsync/uClibc/libc/sysdeps/linux/common/bits/dlfcn.h Tue Mar 27 12:51:34 2007
@@ -25,7 +25,11 @@
 #define RTLD_LAZY	0x00001	/* Lazy function call binding.  */
 #define RTLD_NOW	0x00002	/* Immediate function call binding.  */
 #define	RTLD_BINDING_MASK   0x3	/* Mask of binding time value.  */
-#define RTLD_NOLOAD	0x00004	/* Do not load the object.  */
+/* Remove the following definition as the dlopen
+ * does not support this option.
+ * Its existence confuses the autoconf process.
+ */
+/*#define RTLD_NOLOAD  0x00004 */      /* Do not load the object.  */
 #define RTLD_DEEPBIND	0x00008	/* Use deep binding.  */
 
 /* If the following bit is set in the MODE argument to `dlopen',

Modified: toolchain/branches/upstreamsync/uClibc/libc/unistd/Makefile.in
URL: http://svn.digium.com/view/aadk/toolchain/branches/upstreamsync/uClibc/libc/unistd/Makefile.in?view=diff&rev=262&r1=261&r2=262
==============================================================================
--- toolchain/branches/upstreamsync/uClibc/libc/unistd/Makefile.in (original)
+++ toolchain/branches/upstreamsync/uClibc/libc/unistd/Makefile.in Tue Mar 27 12:51:34 2007
@@ -12,11 +12,11 @@
 # multi source
 CSRC := $(filter-out exec.c,$(CSRC))
 
-ifeq ($(ARCH_USE_MMU),y)
+#ifeq ($(ARCH_USE_MMU),y)
 CSRC := $(filter-out __exec_alloc.c,$(CSRC))
-else
-CSRC := $(filter-out daemon.c,$(CSRC))
-endif
+#else
+#CSRC := $(filter-out daemon.c,$(CSRC))
+#endif
 
 ifeq ($(UCLIBC_HAS_GNU_GETOPT),y)
 CSRC := $(filter-out getopt-susv3.c getopt_long-simple.c,$(CSRC))

Modified: toolchain/branches/upstreamsync/uClibc/libc/unistd/daemon.c
URL: http://svn.digium.com/view/aadk/toolchain/branches/upstreamsync/uClibc/libc/unistd/daemon.c?view=diff&rev=262&r1=261&r2=262
==============================================================================
--- toolchain/branches/upstreamsync/uClibc/libc/unistd/daemon.c (original)
+++ toolchain/branches/upstreamsync/uClibc/libc/unistd/daemon.c Tue Mar 27 12:51:34 2007
@@ -60,7 +60,7 @@
 {
 	int fd;
 
-	switch (fork()) {
+	switch (vfork()) {
 		case -1:
 			return(-1);
 		case 0:
@@ -74,7 +74,7 @@
 
 	/* Make certain we are not a session leader, or else we
 	 * might reacquire a controlling terminal */
-	if (fork())
+	if (vfork())
 		_exit(0);
 
 	if (!nochdir)