svn commit: [25761] branches/uClibc-nptl: libpthread/linuxthreads libpthread/linu etc...

[kraj at uclibc.org]

Author: kraj
Date: 2009-03-19 18:00:28 +0000 (Thu, 19 Mar 2009)
New Revision: 25761

Log:
Merged revisions 25744 via svnmerge from 
svn+ssh://kraj@svn.uclibc.org/svn/trunk/uClibc

........
  r25744 | austinf | 2009-03-18 16:05:54 -0700 (Wed, 18 Mar 2009) | 3 lines
  
  fix compilation of linuxthreads for sparc
  add myself to MAINTAINERS for sparc
........


Added:
   branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h

Modified:
   branches/uClibc-nptl/
   branches/uClibc-nptl/MAINTAINERS
   branches/uClibc-nptl/libpthread/linuxthreads/libc-cancellation.c
   branches/uClibc-nptl/libpthread/linuxthreads/libc_pthread_init.c
   branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/fork.h
   branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h


Changeset:

Property changes on: branches/uClibc-nptl
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/uClibc:1-25696
   + /trunk/uClibc:1-25760

Modified: branches/uClibc-nptl/MAINTAINERS
===================================================================
--- branches/uClibc-nptl/MAINTAINERS	2009-03-19 13:42:05 UTC (rev 25760)
+++ branches/uClibc-nptl/MAINTAINERS	2009-03-19 18:00:28 UTC (rev 25761)
@@ -126,7 +126,9 @@
 
 
 SPARC
-S:	Unmaintained
+P:  Austin Foxley
+E:  austinf at cetoncorp.com
+S:	Maintained
 
 VAX
 P:	Jan-Benedict Glaw

Modified: branches/uClibc-nptl/libpthread/linuxthreads/libc-cancellation.c
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads/libc-cancellation.c	2009-03-19 13:42:05 UTC (rev 25760)
+++ branches/uClibc-nptl/libpthread/linuxthreads/libc-cancellation.c	2009-03-19 18:00:28 UTC (rev 25761)
@@ -31,9 +31,6 @@
 weak_extern (__pthread_do_exit)
 # endif
 
-int __libc_multiple_threads attribute_hidden __attribute__((nocommon));
-strong_alias (__libc_multiple_threads, __librt_multiple_threads)
-
 /* The next two functions are similar to pthread_setcanceltype() but
    more specialized for the use in the cancelable functions like write().
    They do not need to check parameters etc.  */

Modified: branches/uClibc-nptl/libpthread/linuxthreads/libc_pthread_init.c
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads/libc_pthread_init.c	2009-03-19 13:42:05 UTC (rev 25760)
+++ branches/uClibc-nptl/libpthread/linuxthreads/libc_pthread_init.c	2009-03-19 18:00:28 UTC (rev 25761)
@@ -33,6 +33,10 @@
 /* libc_hidden_proto(uselocale) */
 #endif
 
+int __libc_multiple_threads attribute_hidden __attribute__((nocommon));
+strong_alias (__libc_multiple_threads, __librt_multiple_threads)
+
+
 int *
 __libc_pthread_init (functions)
      const struct pthread_functions *functions;

Modified: branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/fork.h
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/fork.h	2009-03-19 13:42:05 UTC (rev 25760)
+++ branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/fork.h	2009-03-19 18:00:28 UTC (rev 25761)
@@ -19,16 +19,5 @@
 
 #include <sysdep.h>
 
-#define ARCH_FORK() \
-({									\
-  register long __o0 __asm__ ("o0");					\
-  register long __o1 __asm__ ("o1");					\
-  register long __g1 __asm__ ("g1") = __NR_fork;			\
-  __asm__ __volatile__ (__SYSCALL_STRING					\
-		    : "=r" (__g1), "=r" (__o0), "=r" (__o1)		\
-		    : "0" (__g1)					\
-		    : __SYSCALL_CLOBBERS);				\
-  __o0 == -1 ? __o0 : (__o0 & (__o1 - 1));				\
-})
-
 #include_next <fork.h>
+

Modified: branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h	2009-03-19 13:42:05 UTC (rev 25760)
+++ branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h	2009-03-19 18:00:28 UTC (rev 25761)
@@ -17,7 +17,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include <sysdep.h>
 #include <tls.h>
 #ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>

Copied: branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h (from rev 25744, trunk/uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h)
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h	                        (rev 0)
+++ branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h	2009-03-19 18:00:28 UTC (rev 25761)
@@ -0,0 +1,10 @@
+#ifndef SPARC_SYSDEP_CANCEL_H
+#define SPARC_SYSDEP_CANCEL_H
+
+#if defined(__arch64__)
+#include <sparc64/sysdep-cancel.h>
+#else
+#include <sparc32/sysdep-cancel.h>
+#endif
+
+#endif