svn commit: branches/uClibc-nptl: extra/Configs extra/locale include libc/ etc...

sjhill at uclibc.org sjhill at uclibc.org
Mon Feb 27 23:13:00 UTC 2006


Author: sjhill
Date: 2006-02-27 15:12:57 -0800 (Mon, 27 Feb 2006)
New Revision: 14318

Log:
Merge from trunk.


Added:
   branches/uClibc-nptl/libpthread/linuxthreads.old/sysdeps/ia64/

Modified:
   branches/uClibc-nptl/extra/Configs/Config.ia64
   branches/uClibc-nptl/extra/Configs/Config.in
   branches/uClibc-nptl/extra/locale/Makefile.in
   branches/uClibc-nptl/include/glob.h
   branches/uClibc-nptl/libc/unistd/Makefile.in
   branches/uClibc-nptl/libc/unistd/getopt-susv3.c
   branches/uClibc-nptl/libpthread/linuxthreads.old/manager.c
   branches/uClibc-nptl/libpthread/linuxthreads.old/pthread.c
   branches/uClibc-nptl/test/misc/Makefile
   branches/uClibc-nptl/utils/ldd.c


Changeset:
Modified: branches/uClibc-nptl/extra/Configs/Config.ia64
===================================================================
--- branches/uClibc-nptl/extra/Configs/Config.ia64	2006-02-27 23:11:46 UTC (rev 14317)
+++ branches/uClibc-nptl/extra/Configs/Config.ia64	2006-02-27 23:12:57 UTC (rev 14318)
@@ -11,7 +11,6 @@
 	default y
 	select ARCH_LITTLE_ENDIAN
 	select ARCH_HAS_MMU
-	select HAS_NO_THREADS
 	select ARCH_HAS_NO_LDSO
 
 config ARCH_CFLAGS

Modified: branches/uClibc-nptl/extra/Configs/Config.in
===================================================================
--- branches/uClibc-nptl/extra/Configs/Config.in	2006-02-27 23:11:46 UTC (rev 14317)
+++ branches/uClibc-nptl/extra/Configs/Config.in	2006-02-27 23:12:57 UTC (rev 14318)
@@ -21,7 +21,7 @@
 	bool "bfin (BROKEN)"
 
 config TARGET_cris
-	bool "cris (BROKEN)"
+	bool "cris"
 
 config TARGET_e1
 	bool "e1 (BROKEN)"
@@ -41,6 +41,9 @@
 config TARGET_i960
 	bool "i960 (BROKEN)"
 
+config TARGET_ia64
+	bool "ia64"
+
 config TARGET_m68k
 	bool "m68k"
 
@@ -51,10 +54,10 @@
 	bool "mips"
 
 config TARGET_nios
-	bool "nios (BROKEN)"
+	bool "nios"
 
 config TARGET_nios2
-	bool "nios2 (BROKEN)"
+	bool "nios2"
 
 config TARGET_powerpc
 	bool "powerpc"
@@ -71,6 +74,9 @@
 config TARGET_v850
 	bool "v850 (BROKEN)"
 
+config TARGET_vax
+	bool "vax"
+
 config TARGET_x86_64
 	bool "x86_64"
 
@@ -119,6 +125,10 @@
 source "extra/Configs/Config.i960"
 endif
 
+if TARGET_ia64
+source "extra/Configs/Config.ia64"
+endif
+
 if TARGET_m68k
 source "extra/Configs/Config.m68k"
 endif
@@ -159,6 +169,10 @@
 source "extra/Configs/Config.v850"
 endif
 
+if TARGET_vax
+source "extra/Configs/Config.vax"
+endif
+
 if TARGET_x86_64
 source "extra/Configs/Config.x86_64"
 endif
@@ -217,7 +231,7 @@
 	  coded shared libraries.
 
 config LDSO_LDD_SUPPORT
-	bool "Native shared library loader 'ldd' support"
+	bool "Native 'ldd' support"
 	depends on HAVE_SHARED
 	default y
 	help
@@ -228,7 +242,7 @@
 	  shared library loader a little bit smaller.  Most people will answer Y.
 
 config LDSO_CACHE_SUPPORT
-	bool "Enable shared library loader cache"
+	bool "Enable library loader cache (ld.so.conf)"
 	depends on HAVE_SHARED
 	default y
 	help
@@ -238,7 +252,7 @@
 	  the /etc/ld.so.cache shared library loader cache file.
 
 config LDSO_PRELOAD_FILE_SUPPORT
-	bool "Enable shared library loader preload file support"
+	bool "Enable library loader preload file (ld.so.preload)"
 	depends on HAVE_SHARED
 	default n
 	help
@@ -263,6 +277,18 @@
 	  WARNING: Changing the default prefix could cause problems with
 	           binutils' ld !
 
+config UCLIBC_STATIC_LDCONFIG
+	bool "Link ldconfig statically"
+	depends on HAVE_SHARED
+	default y
+	help
+	  Enable this option to statically link the ldconfig binary.
+
+	  Making ldconfig static can be beneficial if you have a library
+	  problem and need to use ldconfig to recover.  Sometimes, it is
+	  preferable to instead keep the size of the system down, in which
+	  case you should disable this option.
+
 config LDSO_RUNPATH
 	bool "Enable ELF RUNPATH tag support"
 	depends on HAVE_SHARED
@@ -278,6 +304,7 @@
 
 config UCLIBC_CTOR_DTOR
 	bool "Support global constructors and destructors"
+	depends on !TARGET_bfin
 	default y
 	help
 	  If you wish to build uClibc with support for global constructor
@@ -370,21 +397,10 @@
 	  if you are using an older Linux kernel (2.0.x) that lacks large file
 	  support.  Enabling this option will increase the size of uClibc.
 
-config UCLIBC_STATIC_LDCONFIG
-	bool "Link ldconfig statically"
-	default y
-	help
-	  Enable this option to statically link the ldconfig binary.
-
-	  Making ldconfig static can be beneficial if you have a library
-	  problem and need to use ldconfig to recover.  Sometimes, it is
-	  preferable to instead keep the size of the system down, in which
-	  case you should disable this option.
-
 choice
 	prompt "Malloc Implementation"
-	default MALLOC if ! ARCH_HAS_MMU
-	default MALLOC_STANDARD if ARCH_HAS_MMU
+	default MALLOC if ! ARCH_USE_MMU
+	default MALLOC_STANDARD if ARCH_USE_MMU
 	help
 	  "malloc" use mmap for all allocations and so works very well on MMU-less
 	  systems that do not support the brk() system call.   It is pretty smart
@@ -416,7 +432,7 @@
 
 config MALLOC_STANDARD
 	bool "malloc-standard"
-	depends on ARCH_HAS_MMU
+	depends on ARCH_USE_MMU
 
 endchoice
 
@@ -1099,6 +1115,24 @@
 	  If you want to compile uClibc to use futexes for low-level
 	  I/O locking, answer Y.  Otherwise, answer N.
 
+config UCLIBC_HAS_GETOPT_LONG
+	bool "Support getopt_long/getopt_long_only"
+	depends !UCLIBC_HAS_GNU_GETOPT
+	default y
+	help
+	  Answer Y if you want to include getopt_long[_only() used by many
+	  apps, even busybox.
+
+	  Most people will answer Y.
+
+config UCLIBC_HAS_GNU_GETSUBOPT
+	bool "Support glibc getsubopt"
+	default y
+	help
+	  Answer Y if you want to include glibc getsubopt() instead of a
+	  smaller SUSv3 compatible getsubopt().
+
+	  Most people will answer Y.
 endmenu
 
 
@@ -1174,15 +1208,31 @@
 
 config UCLIBC_HAS_GLOB
 	bool "Support the glob() interface"
+	depends on UCLIBC_HAS_FNMATCH
 	default y
 	help
 
-	  The glob interface is somewhat large (weighing in at about 4k).  It
+	  The glob interface is somewhat large (weighing in at about 2,5k).  It
 	  is used fairly often, but is an option since people wanting to go for
 	  absolute minimum size may wish to omit it.
 
 	  Most people will answer Y.
 
+config UCLIBC_HAS_GNU_GLOB
+	bool "Support gnu glob() interface"
+	depends on UCLIBC_HAS_GLOB
+	default y
+	help
+	  The gnu glob interface is somewhat larger (weighing in at about 4,2k) than
+	  it's SuSv3 counterpart (and is out of date). It is an old copy from glibc and
+	  does not support all the GNU specific options.
+
+	  Answer Y if you want to include full gnu glob() instead of the smaller SUSv3
+	  compatible glob().
+	  It is only default, because it is the old/stable version.
+
+	  Most people will answer N.
+
 endmenu
 
 
@@ -1260,6 +1310,19 @@
 		libraries have to be built with -fPIC or -fpic, and all assembler
 		functions must be written as position independent code (PIC).
 
+config UCLIBC_HAS_ARC4RANDOM
+	bool "Include the arc4random() function"
+	default n
+	help
+	  Answer Y to support the OpenBSD-like arc4random() function. This
+	  function picks a random number between 0 and N, and will always return
+	  something even if the random driver is dead. If urandom fails then
+	  gettimeofday(2) will be used as the random seed. This function is
+	  designed to be more dependable than invoking /dev/urandom directly.
+	  OpenSSL and OpenNTPD currently support this function.
+
+	  Most people will answer N.
+
 config HAVE_NO_SSP
 	bool
 	default n
@@ -1329,7 +1392,7 @@
 config UCLIBC_BUILD_NOW
 	bool "Build uClibc with NOW"
 	depends on HAVE_SHARED
-	default y
+	default n
 	help
 	  Build all libraries and executables with -z now.
 
@@ -1355,8 +1418,8 @@
 
 config DODEBUG
 	bool "Build uClibc with debugging symbols"
-	select PTHREADS_DEBUG_SUPPORT if UCLIBC_HAS_THREADS
 	default n
+	select NOSTRIP
 	help
 	  Say Y here if you wish to compile uClibc with debugging symbols.
 	  This will allow you to use a debugger to examine uClibc internals
@@ -1376,6 +1439,14 @@
 
 	  Otherwise, answer N.
 
+config NOSTRIP
+	bool "Do not build stripped libraries and executables"
+	default n
+	help
+	  Say Y here if you do not wish to strip all uClibc libraries and
+	  executables.  This increases the size of the binaries considerably.
+	  Most people will answer N.
+
 config DOASSERTS
 	bool "Build uClibc with run-time assertion testing"
 	default n
@@ -1458,6 +1529,12 @@
 	help
 	  Set this to the set of gcc warnings you wish to see while compiling.
 
+config EXTRA_WARNINGS
+	bool "Enable extra annoying warnings"
+	default n
+	help
+	  If you wish to build with extra warnings enabled, say Y here.
+
 config DOMULTI
 	bool "Compile all sources at once into an object"
 	default n

Modified: branches/uClibc-nptl/extra/locale/Makefile.in
===================================================================
--- branches/uClibc-nptl/extra/locale/Makefile.in	2006-02-27 23:11:46 UTC (rev 14317)
+++ branches/uClibc-nptl/extra/locale/Makefile.in	2006-02-27 23:12:57 UTC (rev 14318)
@@ -163,12 +163,6 @@
 
 endif
 
-$(locale_OBJ): $(locale_SRC) | $(headers_dep)
-	$(compile.c)
-
-$(locale_OBJ:.o=.os): $(locale_SRC) | $(headers_dep)
-	$(compile.c)
-
 $(top_builddir)include/bits/uClibc_locale_data.h: $(locale_OUT)/uClibc_locale_data.h | $(top_builddir)include/bits/uClibc_config.h
 	cat $< | awk 'BEGIN{i=1}{ if ( /WANT_/ ) i = /endif/ ; else if (i) print $0 }' > $@
 

Modified: branches/uClibc-nptl/include/glob.h
===================================================================
--- branches/uClibc-nptl/include/glob.h	2006-02-27 23:11:46 UTC (rev 14317)
+++ branches/uClibc-nptl/include/glob.h	2006-02-27 23:12:57 UTC (rev 14318)
@@ -53,8 +53,9 @@
 #define	GLOB_NOESCAPE	(1 << 6)/* Backslashes don't quote metacharacters.  */
 #define	GLOB_PERIOD	(1 << 7)/* Leading `.' can be matched by metachars.  */
 
-#if !defined __USE_POSIX2 || defined __USE_BSD || defined __USE_GNU
+#if ( !defined __USE_POSIX2 || defined __USE_BSD || defined __USE_GNU ) && defined __UCLIBC_HAS_GNU_GLOB__
 # define GLOB_MAGCHAR	 (1 << 8)/* Set in gl_flags if any metachars seen.  */
+#if 0 /* uClibc's gnu glob does not support these */
 # define GLOB_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions.  */
 # define GLOB_BRACE	 (1 << 10)/* Expand "{a,b}" to "a" "b".  */
 # define GLOB_NOMAGIC	 (1 << 11)/* If no magic chars, return the pattern.  */
@@ -71,20 +72,25 @@
 			 GLOB_NOESCAPE|GLOB_NOCHECK|GLOB_APPEND|     \
 			 GLOB_PERIOD)
 #endif
+#else
+# define __GLOB_FLAGS	(GLOB_ERR|GLOB_MARK|GLOB_NOSORT|GLOB_DOOFFS| \
+			 GLOB_NOESCAPE|GLOB_NOCHECK|GLOB_APPEND|     \
+			 GLOB_PERIOD)
+#endif
 
 /* Error returns from `glob'.  */
 #define	GLOB_NOSPACE	1	/* Ran out of memory.  */
 #define	GLOB_ABORTED	2	/* Read error.  */
 #define	GLOB_NOMATCH	3	/* No matches found.  */
 #define GLOB_NOSYS	4	/* Not implemented.  */
-#ifdef __USE_GNU
+#if defined __USE_GNU && defined __UCLIBC_HAS_GNU_GLOB__
 /* Previous versions of this file defined GLOB_ABEND instead of
    GLOB_ABORTED.  Provide a compatibility definition here.  */
 # define GLOB_ABEND GLOB_ABORTED
 #endif
 
 /* Structure describing a globbing run.  */
-#ifdef __USE_GNU
+#if defined __USE_GNU && defined __UCLIBC_HAS_GNU_GLOB__
 struct stat;
 #endif
 typedef struct
@@ -92,6 +98,7 @@
     __size_t gl_pathc;		/* Count of paths matched by the pattern.  */
     char **gl_pathv;		/* List of matched pathnames.  */
     __size_t gl_offs;		/* Slots to reserve in `gl_pathv'.  */
+#ifdef __UCLIBC_HAS_GNU_GLOB__
     int gl_flags;		/* Set to FLAGS, maybe | GLOB_MAGCHAR.  */
 
     /* If the GLOB_ALTDIRFUNC flag is set, the following functions
@@ -110,10 +117,11 @@
     int (*gl_lstat) (__const char *__restrict, void *__restrict);
     int (*gl_stat) (__const char *__restrict, void *__restrict);
 #endif
+#endif /* __UCLIBC_HAS_GNU_GLOB__ */
   } glob_t;
 
 #ifdef __USE_LARGEFILE64
-# ifdef __USE_GNU
+# if defined __USE_GNU && defined __UCLIBC_HAS_GNU_GLOB__
 struct stat64;
 # endif
 typedef struct
@@ -121,6 +129,7 @@
     __size_t gl_pathc;
     char **gl_pathv;
     __size_t gl_offs;
+#ifdef __UCLIBC_HAS_GNU_GLOB__
     int gl_flags;
 
     /* If the GLOB_ALTDIRFUNC flag is set, the following functions
@@ -139,6 +148,7 @@
     int (*gl_lstat) (__const char *__restrict, void *__restrict);
     int (*gl_stat) (__const char *__restrict, void *__restrict);
 # endif
+#endif /* __UCLIBC_HAS_GNU_GLOB__ */
   } glob64_t;
 #endif
 
@@ -180,7 +190,7 @@
 #endif
 
 
-#ifdef __USE_GNU
+#if defined __USE_GNU && defined __UCLIBC_HAS_GNU_GLOB__
 /* Return nonzero if PATTERN contains any metacharacters.
    Metacharacters can be quoted with backslashes if QUOTE is nonzero.
 

Modified: branches/uClibc-nptl/libc/unistd/Makefile.in
===================================================================
--- branches/uClibc-nptl/libc/unistd/Makefile.in	2006-02-27 23:11:46 UTC (rev 14317)
+++ branches/uClibc-nptl/libc/unistd/Makefile.in	2006-02-27 23:12:57 UTC (rev 14318)
@@ -19,11 +19,20 @@
 endif
 
 ifeq ($(UCLIBC_HAS_GNU_GETOPT),y)
-CSRC := $(filter-out getopt-susv3.c,$(CSRC))
+CSRC := $(filter-out getopt-susv3.c getopt_long-susv3.c,$(CSRC))
 else
 CSRC := $(filter-out getopt.c,$(CSRC))
+ifneq ($(UCLIBC_HAS_GETOPT_LONG),y)
+CSRC := $(filter-out getopt_long-susv3.c,$(CSRC))
 endif
+endif
 
+ifeq ($(UCLIBC_HAS_GNU_GETSUBOPT),y)
+CSRC := $(filter-out getsubopt-susv3.c,$(CSRC))
+else
+CSRC := $(filter-out getsubopt.c,$(CSRC))
+endif
+
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 CSRC := $(filter-out sleep.c,$(CSRC))
 endif

Modified: branches/uClibc-nptl/libc/unistd/getopt-susv3.c
===================================================================
--- branches/uClibc-nptl/libc/unistd/getopt-susv3.c	2006-02-27 23:11:46 UTC (rev 14317)
+++ branches/uClibc-nptl/libc/unistd/getopt-susv3.c	2006-02-27 23:12:57 UTC (rev 14318)
@@ -59,6 +59,7 @@
 int optopt = 0;
 char *optarg = NULL;
 
+libc_hidden_proto(getopt)
 int getopt(int argc, char * const argv[], const char *optstring)
 {
 	static const char *o;		/* multi opt position */
@@ -135,3 +136,4 @@
  DONE:
 	return retval;
 }
+libc_hidden_def(getopt)

Modified: branches/uClibc-nptl/libpthread/linuxthreads.old/manager.c
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads.old/manager.c	2006-02-27 23:11:46 UTC (rev 14317)
+++ branches/uClibc-nptl/libpthread/linuxthreads.old/manager.c	2006-02-27 23:12:57 UTC (rev 14318)
@@ -583,9 +583,16 @@
 	  __pthread_lock(new_thread->p_lock, NULL);
 
 	  /* We have to report this event.  */
+#ifdef __ia64__
+	  pid = __clone2(pthread_start_thread_event, (void **) new_thread,
+			(char *)new_thread - new_thread_bottom,
+			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
+			__pthread_sig_cancel, new_thread);
+#else
 	  pid = clone(pthread_start_thread_event, (void **) new_thread,
 			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
 			__pthread_sig_cancel, new_thread);
+#endif
 
 	  saved_errno = errno;
 	  if (pid != -1)
@@ -614,9 +621,16 @@
   if (pid == 0)
     {
       PDEBUG("cloning new_thread = %p\n", new_thread);
+#ifdef __ia64__
+      pid = __clone2(pthread_start_thread, (void **) new_thread,
+			(char *)new_thread - new_thread_bottom,
+		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
+		    __pthread_sig_cancel, new_thread);
+#else
       pid = clone(pthread_start_thread, (void **) new_thread,
 		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
 		    __pthread_sig_cancel, new_thread);
+#endif
       saved_errno = errno;
     }
   /* Check if cloning succeeded */

Modified: branches/uClibc-nptl/libpthread/linuxthreads.old/pthread.c
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads.old/pthread.c	2006-02-27 23:11:46 UTC (rev 14317)
+++ branches/uClibc-nptl/libpthread/linuxthreads.old/pthread.c	2006-02-27 23:12:57 UTC (rev 14318)
@@ -528,10 +528,18 @@
 
 	 __pthread_lock(__pthread_manager_thread.p_lock, NULL);
 
+#ifdef __ia64__
+	  pid = __clone2(__pthread_manager_event,
+			(void **) __pthread_manager_thread_tos,
+			THREAD_MANAGER_STACK_SIZE,
+			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
+			(void *)(long)manager_pipe[0]);
+#else
 	  pid = clone(__pthread_manager_event,
 			(void **) __pthread_manager_thread_tos,
 			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
 			(void *)(long)manager_pipe[0]);
+#endif
 
 	  if (pid != -1)
 	    {
@@ -555,9 +563,16 @@
     }
 
   if (pid == 0) {
+#ifdef __ia64__
+    pid = __clone2(__pthread_manager, (void **) __pthread_manager_thread_tos,
+		  THREAD_MANAGER_STACK_SIZE,
+		  CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
+		  (void *)(long)manager_pipe[0]);
+#else
     pid = clone(__pthread_manager, (void **) __pthread_manager_thread_tos,
 		  CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
 		  (void *)(long)manager_pipe[0]);
+#endif
   }
   if (pid == -1) {
     free(__pthread_manager_thread_bos);

Copied: branches/uClibc-nptl/libpthread/linuxthreads.old/sysdeps/ia64 (from rev 14315, trunk/uClibc/libpthread/linuxthreads.old/sysdeps/ia64)

Modified: branches/uClibc-nptl/test/misc/Makefile
===================================================================
--- branches/uClibc-nptl/test/misc/Makefile	2006-02-27 23:11:46 UTC (rev 14317)
+++ branches/uClibc-nptl/test/misc/Makefile	2006-02-27 23:12:57 UTC (rev 14318)
@@ -1,130 +1,14 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2000,2001 Erik Andersen <andersen at uclibc.org>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# uClibc misc tests
+# Licensed under the GNU Library General Public License, see COPYING.LIB
 
-include ../Rules.mak
+TESTS_DISABLED := outb tst-fnmatch
 
-CFLAGS64=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+include ../Test.mak
 
-TARGETS=sem fdopen dirent_diff dirent64_diff #outb
-all: $(TARGETS)
+CFLAGS_dirent64 := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS_tst-regex2 := -std=c99
 
-outb: outb.c ../testsuite.h Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@
-	-@ echo " "
+DODIFF_dirent    := 1
+DODIFF_dirent64  := 1
 
-sem: sem.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@
-	-@ echo " "
-
-fdopen: fdopen.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@
-	-@ echo " "
-
-dirent_source:
-	-@ $(RM) $(TARGETS)
-	-@ echo "-------"
-	-@ echo "dirent.c source: "
-	-@ echo " "
-	-@ cat dirent.c
-	-@ echo " "
-
-dirent: dirent.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@ dirent.c > $@.out
-	-@ echo " "
-
-dirent_glibc: dirent.c Makefile
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs glibc: "
-	-@ echo " "
-	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
-	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@ dirent.c > $@.out
-	-@ echo " "
-
-dirent_diff: dirent dirent_glibc
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Diffing dirent output: "
-	-@ echo " "
-	-diff -u dirent_glibc.out dirent.out
-	-@ echo " "
-
-dirent64: dirent.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) $(CFLAGS64) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@ dirent.c > $@.out
-	-@ echo " "
-
-dirent64_glibc: dirent.c Makefile
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs glibc: "
-	-@ echo " "
-	$(HOSTCC) $(GLIBC_CFLAGS) $(CFLAGS64) -c $< -o $@.o
-	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@ dirent.c > $@.out
-	-@ echo " "
-
-dirent64_diff: dirent64 dirent64_glibc
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Diffing dirent64 output: "
-	-@ echo " "
-	-diff -u dirent64_glibc.out dirent64.out
-	-@ echo " "
-
-clean:
-	$(RM) *.[oa] *~ core dirent dirent_glibc dirent_glibc.out dirent.out \
-		dirent64 dirent64_glibc dirent64_glibc.out dirent64.out \
-		outb sem fdopen
+OPTS_tst-fnmatch := < tst-fnmatch.input

Modified: branches/uClibc-nptl/utils/ldd.c
===================================================================
--- branches/uClibc-nptl/utils/ldd.c	2006-02-27 23:11:46 UTC (rev 14317)
+++ branches/uClibc-nptl/utils/ldd.c	2006-02-27 23:12:57 UTC (rev 14318)
@@ -645,7 +645,9 @@
 }
 
 /* map the .so, and locate interesting pieces */
+/*
 #warning "There may be two warnings here about vfork() clobbering, ignore them"
+*/
 int find_dependancies(char* filename)
 {
 	int is_suid = 0;




More information about the uClibc-cvs mailing list