svn commit: branches/uClibc-nptl: libc/sysdeps/linux/common libpthread/npt etc...

[kraj at uclibc.org]

Author: kraj
Date: 2008-07-09 20:27:42 -0700 (Wed, 09 Jul 2008)
New Revision: 22736

Log:
Exclude some files for ARM NPTL, Do not use _libc_fatal

Modified:
   branches/uClibc-nptl/libc/sysdeps/linux/common/Makefile.in
   branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
   branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c


Changeset:
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/Makefile.in
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/Makefile.in	2008-07-10 02:02:18 UTC (rev 22735)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/Makefile.in	2008-07-10 03:27:42 UTC (rev 22736)
@@ -40,8 +40,13 @@
 endif
 	
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-CSRC := $(filter-out fork.c getpid.c raise.c open.c close.c read.c write.c waitpid.c, $(CSRC))
+CSRC := $(filter-out fork.c getpid.c raise.c open.c close.c read.c write.c, $(CSRC))
+ifneq ($(TARGET_ARCH),arm)
+CSRC := $(filter-out waitpid.c, $(CSRC))
+else
+CSRC := $(filter-out vfork.c, $(CSRC))
 endif
+endif
 
 ifneq ($(UCLIBC_BSD_SPECIFIC),y)
 # we need these internally: getdomainname.c

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in	2008-07-10 02:02:18 UTC (rev 22735)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in	2008-07-10 03:27:42 UTC (rev 22736)
@@ -20,8 +20,12 @@
 	    raise.c sleep.c jmp-unwind.c
 
 # These provide both a cancellable and a not cancellable implementation 
-libc_SSRC = close.S open.S waitpid.S write.S read.S
+libc_SSRC = close.S open.S write.S read.S
 
+ifneq ($(TARGET_ARCH),arm)
+libc_SSRC += waitpid.S
+endif
+
 librt_CSRC := mq_notify.c timer_create.c timer_delete.c			 \
 	      timer_getoverr.c timer_gettime.c timer_routines.c		 \
 	      timer_settime.c

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c	2008-07-10 02:02:18 UTC (rev 22735)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c	2008-07-10 03:27:42 UTC (rev 22736)
@@ -21,6 +21,9 @@
 #include <stdio.h>
 #include <unwind.h>
 
+#define __libc_dlopen(x)	dlopen(x, (RTLD_LOCAL | RTLD_LAZY))
+#define __libc_dlsym		dlsym
+
 static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 static _Unwind_Reason_Code (*libgcc_s_personality)
   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
@@ -37,8 +40,10 @@
 
   if (handle == NULL
       || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL
-      || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL)
-    __libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n");
+      || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL) {
+    fprintf(stderr, "libgcc_s.so.1 must be installed for pthread_cancel to work\n");
+    abort ();
+  }
 
   libgcc_s_resume = resume;
   libgcc_s_personality = personality;