summaryrefslogtreecommitdiffstats
path: root/libpthread/linuxthreads
diff options
context:
space:
mode:
Diffstat (limited to 'libpthread/linuxthreads')
-rw-r--r--libpthread/linuxthreads/CVS/Entries14
-rw-r--r--libpthread/linuxthreads/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/Makefile.in9
-rw-r--r--libpthread/linuxthreads/attr.c22
-rw-r--r--libpthread/linuxthreads/cancel.c4
-rw-r--r--libpthread/linuxthreads/forward.c4
-rw-r--r--libpthread/linuxthreads/internals.h2
-rw-r--r--libpthread/linuxthreads/join.c2
-rw-r--r--libpthread/linuxthreads/libc-cancellation.c2
-rw-r--r--libpthread/linuxthreads/libc_pthread_init.c5
-rw-r--r--libpthread/linuxthreads/manager.c7
-rw-r--r--libpthread/linuxthreads/pthread_atfork.c6
-rw-r--r--libpthread/linuxthreads/sysdeps/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/alpha/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/alpha/elf/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/arm/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/cris/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/hppa/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/i386/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/i386/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/i386/i586/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/i386/i586/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/i386/i686/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/i386/i686/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/ia64/CVS/Entries4
-rw-r--r--libpthread/linuxthreads/sysdeps/ia64/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/m68k/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/mips/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/mips/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/powerpc/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/powerpc/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/powerpc/powerpc32/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/powerpc/powerpc64/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/s390/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/s390/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/s390/s390-32/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/s390/s390-64/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/sh/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/sh/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/sparc/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/sparc/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/sparc/sparc32/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/sparc/sparc32/sparcv9/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/sparc/sparc32/sparcv9/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/sparc/sparc64/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/sparc/sparc64/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Entries6
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c6
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/CVS/Entries4
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/bits/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/bits/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/CVS/Entries4
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/bits/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/CVS/Entries4
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/bits/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/bits/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/x86_64/CVS/Entries2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/x86_64/CVS/Repository2
-rw-r--r--libpthread/linuxthreads/sysdeps/x86_64/CVS/Entries4
-rw-r--r--libpthread/linuxthreads/sysdeps/x86_64/CVS/Repository2
84 files changed, 122 insertions, 119 deletions
diff --git a/libpthread/linuxthreads/CVS/Entries b/libpthread/linuxthreads/CVS/Entries
index 90bfb28bc..36d8ad29f 100644
--- a/libpthread/linuxthreads/CVS/Entries
+++ b/libpthread/linuxthreads/CVS/Entries
@@ -2,7 +2,6 @@
/lockfile.c/1.10/Wed Dec 18 01:16:46 2002//
/pthread.c/1.136/Sun Jan 9 20:02:37 2005//
D/sysdeps////
-/Makefile/1.99/Mon Nov 7 16:58:12 2005//
/descr.h/1.16/Mon Nov 14 19:51:28 2005//
/attr.c/1.36/Tue Nov 15 14:20:47 2005//
/barrier.c/1.4/Tue Nov 15 14:20:48 2005//
@@ -26,7 +25,6 @@ D/sysdeps////
/ptclock_gettime.c/1.3/Tue Nov 15 14:20:48 2005//
/ptclock_settime.c/1.3/Tue Nov 15 14:20:47 2005//
/pthandles.c/1.1/Tue Nov 15 14:20:47 2005//
-/pthread_atfork.c/1.2/Tue Nov 15 14:20:47 2005//
/pthread_setegid.c/1.1/Tue Nov 15 14:20:47 2005//
/pthread_seteuid.c/1.1/Tue Nov 15 14:20:47 2005//
/pthread_setgid.c/1.1/Tue Nov 15 14:20:48 2005//
@@ -42,7 +40,6 @@ D/sysdeps////
/semaphore.h/1.13/Tue Nov 15 14:20:48 2005//
/sighandler.c/1.2/Tue Nov 15 14:20:47 2005//
/signals.c/1.29/Tue Nov 15 14:20:47 2005//
-/spinlock.c/1.38/Tue Nov 15 14:20:47 2005//
/spinlock.h/1.24/Tue Nov 15 14:20:48 2005//
/tst-_res1.c/-1.1/Tue Nov 15 16:18:58 2005//
/tst-_res1mod1.c/-1.1/Tue Nov 15 16:18:58 2005//
@@ -89,17 +86,20 @@ D/sysdeps////
/libc-cancellation.c/1.6/Fri Jan 20 15:05:11 2006//
/alloca_cutoff.c/1.2/Tue Apr 1 00:52:40 2003//
/Banner/1.4/Tue Jan 31 05:06:13 2006//
-/ChangeLog/1.861/Tue Jan 31 05:06:13 2006//
/Changes/1.2/Tue Jan 31 05:06:13 2006//
/FAQ.html/1.3/Tue Jan 31 05:06:13 2006//
/LICENSE/1.1/Tue Jan 31 05:06:13 2006//
/Makeconfig/1.3/Tue Jan 31 05:06:13 2006//
/README/1.2/Tue Jan 31 05:06:13 2006//
/README.Xfree3.2/1.1/Tue Jan 31 05:06:13 2006//
-/configure/1.3/Tue Jan 31 05:06:13 2006//
-/configure.in/1.1/Tue Jan 31 05:06:13 2006//
/linuxthreads.texi/1.15/Tue Jan 31 05:06:14 2006//
/shlib-versions/1.10/Tue Jan 31 05:06:14 2006//
D/Examples////
D/man////
-/Versions/1.49/Thu Feb 2 15:33:05 2006//
+/ChangeLog/1.866/Thu Mar 9 20:32:29 2006//
+/Makefile/1.100/Result of merge+Thu Mar 9 20:32:30 2006//
+/Versions/1.49/Thu Mar 9 20:32:30 2006//
+/configure/1.4/Thu Mar 9 20:32:30 2006//
+/configure.in/1.2/Thu Mar 9 20:32:30 2006//
+/pthread_atfork.c/1.2/Thu Mar 9 20:26:41 2006//
+/spinlock.c/1.39/Fri Mar 10 00:42:28 2006//
diff --git a/libpthread/linuxthreads/CVS/Repository b/libpthread/linuxthreads/CVS/Repository
index 186bbabea..d753f2beb 100644
--- a/libpthread/linuxthreads/CVS/Repository
+++ b/libpthread/linuxthreads/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads
+linuxthreads/linuxthreads
diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in
index 66f5ac544..a5f52ec12 100644
--- a/libpthread/linuxthreads/Makefile.in
+++ b/libpthread/linuxthreads/Makefile.in
@@ -70,6 +70,8 @@ libc-shared-y += $(libpthread_libc_OBJ:.o=.oS)
libpthread-static-y += $(patsubst %,$(libpthread_OUT)/%.o,$(libpthread_static_SRC))
+libpthread-nonshared-y += $(patsubst %,$(libpthread_OUT)/%.oS,$(libpthread_static_SRC))
+
ifeq ($(DOPIC),y)
libpthread-a-y += $(libpthread_OBJ:.o=.os) $(libpthread-static-y:.o=.os)
else
@@ -84,12 +86,15 @@ headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
headers_clean-y += linuxthreads_headers_clean
#ifeq ($(DOMULTI),n)
-$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc)
+$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc) $(top_builddir)lib/libpthread_nonshared.a
$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
#else
-#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc)
+#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc) $(top_builddir)lib/libpthread_nonshared.a
# $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
#endif
+ $(Q)$(RM) $@
+ $(Q)cp $(top_srcdir)extra/scripts/format.lds $@
+ $(Q)echo "GROUP ( $(notdir $@).$(MAJOR_VERSION) libpthread_nonshared.a )" >> $@
$(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
$(Q)$(RM) $@
diff --git a/libpthread/linuxthreads/attr.c b/libpthread/linuxthreads/attr.c
index e60f2ed32..52e115c8e 100644
--- a/libpthread/linuxthreads/attr.c
+++ b/libpthread/linuxthreads/attr.c
@@ -52,7 +52,7 @@ int __pthread_attr_destroy(pthread_attr_t *attr)
{
return 0;
}
-strong_alias (__pthread_attr_destroy, pthread_attr_destroy);
+strong_alias (__pthread_attr_destroy, pthread_attr_destroy)
int __pthread_attr_setdetachstate(pthread_attr_t *attr, int detachstate)
{
@@ -62,14 +62,14 @@ int __pthread_attr_setdetachstate(pthread_attr_t *attr, int detachstate)
attr->__detachstate = detachstate;
return 0;
}
-strong_alias (__pthread_attr_setdetachstate, pthread_attr_setdetachstate);
+strong_alias (__pthread_attr_setdetachstate, pthread_attr_setdetachstate)
int __pthread_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate)
{
*detachstate = attr->__detachstate;
return 0;
}
-strong_alias (__pthread_attr_getdetachstate, pthread_attr_getdetachstate);
+strong_alias (__pthread_attr_getdetachstate, pthread_attr_getdetachstate)
int __pthread_attr_setschedparam(pthread_attr_t *attr,
const struct sched_param *param)
@@ -82,7 +82,7 @@ int __pthread_attr_setschedparam(pthread_attr_t *attr,
memcpy (&attr->__schedparam, param, sizeof (struct sched_param));
return 0;
}
-strong_alias (__pthread_attr_setschedparam, pthread_attr_setschedparam);
+strong_alias (__pthread_attr_setschedparam, pthread_attr_setschedparam)
int __pthread_attr_getschedparam(const pthread_attr_t *attr,
struct sched_param *param)
@@ -90,7 +90,7 @@ int __pthread_attr_getschedparam(const pthread_attr_t *attr,
memcpy (param, &attr->__schedparam, sizeof (struct sched_param));
return 0;
}
-strong_alias (__pthread_attr_getschedparam, pthread_attr_getschedparam);
+strong_alias (__pthread_attr_getschedparam, pthread_attr_getschedparam)
int __pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy)
{
@@ -99,14 +99,14 @@ int __pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy)
attr->__schedpolicy = policy;
return 0;
}
-strong_alias (__pthread_attr_setschedpolicy, pthread_attr_setschedpolicy);
+strong_alias (__pthread_attr_setschedpolicy, pthread_attr_setschedpolicy)
int __pthread_attr_getschedpolicy(const pthread_attr_t *attr, int *policy)
{
*policy = attr->__schedpolicy;
return 0;
}
-strong_alias (__pthread_attr_getschedpolicy, pthread_attr_getschedpolicy);
+strong_alias (__pthread_attr_getschedpolicy, pthread_attr_getschedpolicy)
int __pthread_attr_setinheritsched(pthread_attr_t *attr, int inherit)
{
@@ -115,14 +115,14 @@ int __pthread_attr_setinheritsched(pthread_attr_t *attr, int inherit)
attr->__inheritsched = inherit;
return 0;
}
-strong_alias (__pthread_attr_setinheritsched, pthread_attr_setinheritsched);
+strong_alias (__pthread_attr_setinheritsched, pthread_attr_setinheritsched)
int __pthread_attr_getinheritsched(const pthread_attr_t *attr, int *inherit)
{
*inherit = attr->__inheritsched;
return 0;
}
-strong_alias (__pthread_attr_getinheritsched, pthread_attr_getinheritsched);
+strong_alias (__pthread_attr_getinheritsched, pthread_attr_getinheritsched)
int __pthread_attr_setscope(pthread_attr_t *attr, int scope)
{
@@ -136,14 +136,14 @@ int __pthread_attr_setscope(pthread_attr_t *attr, int scope)
return EINVAL;
}
}
-strong_alias (__pthread_attr_setscope, pthread_attr_setscope);
+strong_alias (__pthread_attr_setscope, pthread_attr_setscope)
int __pthread_attr_getscope(const pthread_attr_t *attr, int *scope)
{
*scope = attr->__scope;
return 0;
}
-strong_alias (__pthread_attr_getscope, pthread_attr_getscope);
+strong_alias (__pthread_attr_getscope, pthread_attr_getscope)
int __pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize)
{
diff --git a/libpthread/linuxthreads/cancel.c b/libpthread/linuxthreads/cancel.c
index 27ec7f9c2..34356801a 100644
--- a/libpthread/linuxthreads/cancel.c
+++ b/libpthread/linuxthreads/cancel.c
@@ -43,7 +43,7 @@ int __pthread_setcancelstate(int state, int * oldstate)
__pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
return 0;
}
-strong_alias (__pthread_setcancelstate, pthread_setcancelstate);
+strong_alias (__pthread_setcancelstate, pthread_setcancelstate)
int __pthread_setcanceltype(int type, int * oldtype)
{
@@ -58,7 +58,7 @@ int __pthread_setcanceltype(int type, int * oldtype)
__pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
return 0;
}
-strong_alias (__pthread_setcanceltype, pthread_setcanceltype);
+strong_alias (__pthread_setcanceltype, pthread_setcanceltype)
/* The next two functions are similar to pthread_setcanceltype() but
diff --git a/libpthread/linuxthreads/forward.c b/libpthread/linuxthreads/forward.c
index 96fef59e4..9ce119849 100644
--- a/libpthread/linuxthreads/forward.c
+++ b/libpthread/linuxthreads/forward.c
@@ -43,7 +43,7 @@ name decl \
FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0)
-FORWARD (__pthread_attr_init, (pthread_attr_t *attr), (attr), 0)
+FORWARD (pthread_attr_init, (pthread_attr_t *attr), (attr), 0)
FORWARD (pthread_attr_getdetachstate,
(const pthread_attr_t *attr, int *detachstate), (attr, detachstate),
@@ -102,7 +102,7 @@ FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2),
/* Use an alias to avoid warning, as pthread_exit is declared noreturn. */
FORWARD2 (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS))
-strong_alias (__pthread_exit, pthread_exit);
+strong_alias (__pthread_exit, pthread_exit)
FORWARD (pthread_getschedparam,
diff --git a/libpthread/linuxthreads/internals.h b/libpthread/linuxthreads/internals.h
index 9be272fe7..c8e4262d6 100644
--- a/libpthread/linuxthreads/internals.h
+++ b/libpthread/linuxthreads/internals.h
@@ -392,8 +392,6 @@ extern void __pthread_wait_for_restart_signal(pthread_descr self);
extern void __pthread_sigsuspend (const sigset_t *mask) attribute_hidden;
-extern int __pthread_yield (void);
-
extern int __pthread_rwlock_timedrdlock (pthread_rwlock_t *__restrict __rwlock,
__const struct timespec *__restrict
__abstime);
diff --git a/libpthread/linuxthreads/join.c b/libpthread/linuxthreads/join.c
index c9c030f6f..57ea54e34 100644
--- a/libpthread/linuxthreads/join.c
+++ b/libpthread/linuxthreads/join.c
@@ -28,7 +28,7 @@ void __pthread_exit(void * retval)
{
__pthread_do_exit (retval, CURRENT_STACK_FRAME);
}
-strong_alias (__pthread_exit, pthread_exit);
+strong_alias (__pthread_exit, pthread_exit)
void __pthread_do_exit(void *retval, char *currentframe)
{
diff --git a/libpthread/linuxthreads/libc-cancellation.c b/libpthread/linuxthreads/libc-cancellation.c
index c28920feb..d97359b22 100644
--- a/libpthread/linuxthreads/libc-cancellation.c
+++ b/libpthread/linuxthreads/libc-cancellation.c
@@ -32,7 +32,7 @@ weak_extern (__pthread_do_exit)
# endif
int __libc_multiple_threads attribute_hidden __attribute__((nocommon));
-strong_alias (__libc_multiple_threads, __librt_multiple_threads);
+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().
diff --git a/libpthread/linuxthreads/libc_pthread_init.c b/libpthread/linuxthreads/libc_pthread_init.c
index 5a43eac04..e8482c554 100644
--- a/libpthread/linuxthreads/libc_pthread_init.c
+++ b/libpthread/linuxthreads/libc_pthread_init.c
@@ -28,6 +28,7 @@
#ifdef SHARED
libc_hidden_proto(memcpy)
#endif
+
#if !(USE_TLS && HAVE___THREAD) && defined __UCLIBC_HAS_XLOCALE__
libc_hidden_proto(uselocale)
#endif
@@ -44,10 +45,10 @@ __libc_pthread_init (functions)
sizeof (__libc_pthread_functions));
#endif
-#if !(USE_TLS && HAVE___THREAD) && defined __UCLIBC_HAS_XLOCALE__
+#if !(USE_TLS && HAVE___THREAD)
/* Initialize thread-locale current locale to point to the global one.
With __thread support, the variable's initializer takes care of this. */
- uselocale (LC_GLOBAL_LOCALE);
+ __uselocale (LC_GLOBAL_LOCALE);
#endif
return &__libc_multiple_threads;
diff --git a/libpthread/linuxthreads/manager.c b/libpthread/linuxthreads/manager.c
index 42912edb7..bbdbd59a0 100644
--- a/libpthread/linuxthreads/manager.c
+++ b/libpthread/linuxthreads/manager.c
@@ -37,11 +37,6 @@
#include "semaphore.h"
#include <not-cancel.h>
-#define __clone clone
-#if !(USE_TLS && HAVE___THREAD) && defined __UCLIBC_HAS_XLOCALE__
-#define __uselocale(x) uselocale(x)
-#endif
-
/* For debugging purposes put the maximum number of threads in a variable. */
const int __linuxthreads_pthread_threads_max = PTHREAD_THREADS_MAX;
@@ -297,9 +292,7 @@ pthread_start_thread(void *arg)
#if !(USE_TLS && HAVE___THREAD)
/* Initialize thread-locale current locale to point to the global one.
With __thread support, the variable's initializer takes care of this. */
-#ifdef __UCLIBC_HAS_XLOCALE__
__uselocale (LC_GLOBAL_LOCALE);
-#endif
#else
/* Initialize __resp. */
__resp = &self->p_res;
diff --git a/libpthread/linuxthreads/pthread_atfork.c b/libpthread/linuxthreads/pthread_atfork.c
index 2a67e3d6e..2464acb6b 100644
--- a/libpthread/linuxthreads/pthread_atfork.c
+++ b/libpthread/linuxthreads/pthread_atfork.c
@@ -44,8 +44,10 @@ extern void *__dso_handle __attribute__ ((__weak__));
/* Hide the symbol so that no definition but the one locally in the
executable or DSO is used. */
int
+#ifndef __pthread_atfork
/* Don't mark the compatibility function as hidden. */
attribute_hidden
+#endif
__pthread_atfork (prepare, parent, child)
void (*prepare) (void);
void (*parent) (void);
@@ -54,4 +56,8 @@ __pthread_atfork (prepare, parent, child)
return __register_atfork (prepare, parent, child,
&__dso_handle == NULL ? NULL : __dso_handle);
}
+#ifndef __pthread_atfork
+extern int pthread_atfork (void (*prepare) (void), void (*parent) (void),
+ void (*child) (void)) attribute_hidden;
strong_alias (__pthread_atfork, pthread_atfork)
+#endif
diff --git a/libpthread/linuxthreads/sysdeps/CVS/Repository b/libpthread/linuxthreads/sysdeps/CVS/Repository
index 7d16804bc..d515068af 100644
--- a/libpthread/linuxthreads/sysdeps/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps
+linuxthreads/linuxthreads/sysdeps
diff --git a/libpthread/linuxthreads/sysdeps/alpha/CVS/Repository b/libpthread/linuxthreads/sysdeps/alpha/CVS/Repository
index 5b2ecdbf1..774c4ed9c 100644
--- a/libpthread/linuxthreads/sysdeps/alpha/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/alpha/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/alpha
+linuxthreads/linuxthreads/sysdeps/alpha
diff --git a/libpthread/linuxthreads/sysdeps/alpha/elf/CVS/Repository b/libpthread/linuxthreads/sysdeps/alpha/elf/CVS/Repository
index 4b96d3fd2..89fe86565 100644
--- a/libpthread/linuxthreads/sysdeps/alpha/elf/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/alpha/elf/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/alpha/elf
+linuxthreads/linuxthreads/sysdeps/alpha/elf
diff --git a/libpthread/linuxthreads/sysdeps/arm/CVS/Repository b/libpthread/linuxthreads/sysdeps/arm/CVS/Repository
index ca0825598..ac6128a73 100644
--- a/libpthread/linuxthreads/sysdeps/arm/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/arm/CVS/Repository
@@ -1 +1 @@
-ports/sysdeps/arm/linuxthreads
+linuxthreads/sysdeps/arm/linuxthreads
diff --git a/libpthread/linuxthreads/sysdeps/cris/CVS/Repository b/libpthread/linuxthreads/sysdeps/cris/CVS/Repository
index f38568a22..dc196631f 100644
--- a/libpthread/linuxthreads/sysdeps/cris/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/cris/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/cris
+linuxthreads/linuxthreads/sysdeps/cris
diff --git a/libpthread/linuxthreads/sysdeps/hppa/CVS/Repository b/libpthread/linuxthreads/sysdeps/hppa/CVS/Repository
index 22961c336..926ec8201 100644
--- a/libpthread/linuxthreads/sysdeps/hppa/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/hppa/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/hppa
+linuxthreads/linuxthreads/sysdeps/hppa
diff --git a/libpthread/linuxthreads/sysdeps/i386/CVS/Entries b/libpthread/linuxthreads/sysdeps/i386/CVS/Entries
index 4a05c6447..f0ef33ea9 100644
--- a/libpthread/linuxthreads/sysdeps/i386/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/i386/CVS/Entries
@@ -5,4 +5,4 @@ D/i686////
/useldt.h/1.26/Tue Nov 15 14:20:47 2005//
/tls.h/1.38/Wed Nov 16 19:58:55 2005//
/pspinlock.c/1.5/Fri Jan 20 14:26:17 2006//
-/Makefile/1.8/Tue Jan 31 05:06:14 2006//
+/Makefile/1.8/Thu Mar 9 20:32:30 2006//
diff --git a/libpthread/linuxthreads/sysdeps/i386/CVS/Repository b/libpthread/linuxthreads/sysdeps/i386/CVS/Repository
index 8c3d8cb5e..d6ff1f003 100644
--- a/libpthread/linuxthreads/sysdeps/i386/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/i386/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/i386
+linuxthreads/linuxthreads/sysdeps/i386
diff --git a/libpthread/linuxthreads/sysdeps/i386/i586/CVS/Entries b/libpthread/linuxthreads/sysdeps/i386/i586/CVS/Entries
index 82800d423..2802e3b8d 100644
--- a/libpthread/linuxthreads/sysdeps/i386/i586/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/i386/i586/CVS/Entries
@@ -1,2 +1,2 @@
-/Versions/1.2/Thu Feb 2 15:33:07 2006//
+/Versions/1.2/Thu Mar 9 20:32:30 2006//
D
diff --git a/libpthread/linuxthreads/sysdeps/i386/i586/CVS/Repository b/libpthread/linuxthreads/sysdeps/i386/i586/CVS/Repository
index c3870d708..6b2914a4c 100644
--- a/libpthread/linuxthreads/sysdeps/i386/i586/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/i386/i586/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/i386/i586
+linuxthreads/linuxthreads/sysdeps/i386/i586
diff --git a/libpthread/linuxthreads/sysdeps/i386/i686/CVS/Entries b/libpthread/linuxthreads/sysdeps/i386/i686/CVS/Entries
index 5f70537b3..e18243dab 100644
--- a/libpthread/linuxthreads/sysdeps/i386/i686/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/i386/i686/CVS/Entries
@@ -1,3 +1,3 @@
/pt-machine.h/1.24/Tue Nov 15 14:20:47 2005//
-/Versions/1.2/Thu Feb 2 15:33:07 2006//
+/Versions/1.2/Thu Mar 9 20:32:30 2006//
D
diff --git a/libpthread/linuxthreads/sysdeps/i386/i686/CVS/Repository b/libpthread/linuxthreads/sysdeps/i386/i686/CVS/Repository
index fe1f7daef..6accf528c 100644
--- a/libpthread/linuxthreads/sysdeps/i386/i686/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/i386/i686/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/i386/i686
+linuxthreads/linuxthreads/sysdeps/i386/i686
diff --git a/libpthread/linuxthreads/sysdeps/ia64/CVS/Entries b/libpthread/linuxthreads/sysdeps/ia64/CVS/Entries
index 6040b7477..db590f6d8 100644
--- a/libpthread/linuxthreads/sysdeps/ia64/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/ia64/CVS/Entries
@@ -2,6 +2,6 @@
/pt-machine.h/1.15/Tue Nov 15 14:20:47 2005//
/tcb-offsets.sym/1.6/Tue Nov 15 14:20:47 2005//
/tls.h/1.10/Wed Nov 16 19:58:55 2005//
-/Makefile/1.1/Tue Jan 31 05:06:14 2006//
-/Versions/1.2/Thu Feb 2 15:33:07 2006//
+/Makefile/1.1/Thu Mar 9 20:32:30 2006//
+/Versions/1.2/Thu Mar 9 20:32:30 2006//
D
diff --git a/libpthread/linuxthreads/sysdeps/ia64/CVS/Repository b/libpthread/linuxthreads/sysdeps/ia64/CVS/Repository
index 24c4c03c9..9daad8567 100644
--- a/libpthread/linuxthreads/sysdeps/ia64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/ia64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/ia64
+linuxthreads/linuxthreads/sysdeps/ia64
diff --git a/libpthread/linuxthreads/sysdeps/m68k/CVS/Repository b/libpthread/linuxthreads/sysdeps/m68k/CVS/Repository
index 39713690e..2ad43d571 100644
--- a/libpthread/linuxthreads/sysdeps/m68k/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/m68k/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/m68k
+linuxthreads/linuxthreads/sysdeps/m68k
diff --git a/libpthread/linuxthreads/sysdeps/mips/CVS/Entries b/libpthread/linuxthreads/sysdeps/mips/CVS/Entries
index c72c96d32..29f9bf086 100644
--- a/libpthread/linuxthreads/sysdeps/mips/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/mips/CVS/Entries
@@ -1,4 +1,4 @@
/pspinlock.c/1.15/Tue Nov 15 14:20:47 2005//
/pt-machine.h/1.18/Tue Nov 15 14:20:47 2005//
-/tls.h/1.1/Tue Nov 15 14:20:47 2005//
+/tls.h/1.2/Fri Mar 10 00:42:09 2006//
D
diff --git a/libpthread/linuxthreads/sysdeps/mips/CVS/Repository b/libpthread/linuxthreads/sysdeps/mips/CVS/Repository
index 9903d544c..81cb7ff76 100644
--- a/libpthread/linuxthreads/sysdeps/mips/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/mips/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/mips
+linuxthreads/linuxthreads/sysdeps/mips
diff --git a/libpthread/linuxthreads/sysdeps/powerpc/CVS/Entries b/libpthread/linuxthreads/sysdeps/powerpc/CVS/Entries
index 2a3dda789..9bf8bb887 100644
--- a/libpthread/linuxthreads/sysdeps/powerpc/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/powerpc/CVS/Entries
@@ -2,4 +2,4 @@ D/powerpc32////
D/powerpc64////
/tcb-offsets.sym/1.8/Tue Nov 15 14:20:47 2005//
/tls.h/1.9/Tue Nov 15 14:20:47 2005//
-/Makefile/1.2/Tue Jan 31 05:06:14 2006//
+/Makefile/1.2/Thu Mar 9 20:32:31 2006//
diff --git a/libpthread/linuxthreads/sysdeps/powerpc/CVS/Repository b/libpthread/linuxthreads/sysdeps/powerpc/CVS/Repository
index f49a0de0c..0b2ee694d 100644
--- a/libpthread/linuxthreads/sysdeps/powerpc/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/powerpc/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/powerpc
+linuxthreads/linuxthreads/sysdeps/powerpc
diff --git a/libpthread/linuxthreads/sysdeps/powerpc/powerpc32/CVS/Repository b/libpthread/linuxthreads/sysdeps/powerpc/powerpc32/CVS/Repository
index 04a3b2b13..4dcf109a0 100644
--- a/libpthread/linuxthreads/sysdeps/powerpc/powerpc32/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/powerpc/powerpc32/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/powerpc/powerpc32
+linuxthreads/linuxthreads/sysdeps/powerpc/powerpc32
diff --git a/libpthread/linuxthreads/sysdeps/powerpc/powerpc64/CVS/Repository b/libpthread/linuxthreads/sysdeps/powerpc/powerpc64/CVS/Repository
index 37d5b8c8c..95de327a6 100644
--- a/libpthread/linuxthreads/sysdeps/powerpc/powerpc64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/powerpc/powerpc64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/powerpc/powerpc64
+linuxthreads/linuxthreads/sysdeps/powerpc/powerpc64
diff --git a/libpthread/linuxthreads/sysdeps/s390/CVS/Entries b/libpthread/linuxthreads/sysdeps/s390/CVS/Entries
index 5754b2a9c..3f238e456 100644
--- a/libpthread/linuxthreads/sysdeps/s390/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/s390/CVS/Entries
@@ -3,4 +3,4 @@ D/s390-64////
/pspinlock.c/1.5/Tue Nov 15 14:20:47 2005//
/tcb-offsets.sym/1.1/Tue Nov 15 14:20:47 2005//
/tls.h/1.4/Tue Nov 15 14:20:47 2005//
-/Makefile/1.1/Tue Jan 31 05:06:14 2006//
+/Makefile/1.1/Thu Mar 9 20:32:31 2006//
diff --git a/libpthread/linuxthreads/sysdeps/s390/CVS/Repository b/libpthread/linuxthreads/sysdeps/s390/CVS/Repository
index f6ec8d649..487752799 100644
--- a/libpthread/linuxthreads/sysdeps/s390/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/s390/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/s390
+linuxthreads/linuxthreads/sysdeps/s390
diff --git a/libpthread/linuxthreads/sysdeps/s390/s390-32/CVS/Repository b/libpthread/linuxthreads/sysdeps/s390/s390-32/CVS/Repository
index f2c1c2857..1f4d2dceb 100644
--- a/libpthread/linuxthreads/sysdeps/s390/s390-32/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/s390/s390-32/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/s390/s390-32
+linuxthreads/linuxthreads/sysdeps/s390/s390-32
diff --git a/libpthread/linuxthreads/sysdeps/s390/s390-64/CVS/Repository b/libpthread/linuxthreads/sysdeps/s390/s390-64/CVS/Repository
index 107825fb6..c44803aee 100644
--- a/libpthread/linuxthreads/sysdeps/s390/s390-64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/s390/s390-64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/s390/s390-64
+linuxthreads/linuxthreads/sysdeps/s390/s390-64
diff --git a/libpthread/linuxthreads/sysdeps/sh/CVS/Entries b/libpthread/linuxthreads/sysdeps/sh/CVS/Entries
index 4e9c0a157..0c64f55d6 100644
--- a/libpthread/linuxthreads/sysdeps/sh/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/sh/CVS/Entries
@@ -2,5 +2,5 @@
/pt-machine.h/1.14/Tue Nov 15 14:20:47 2005//
/tcb-offsets.sym/1.4/Tue Nov 15 14:20:47 2005//
/tls.h/1.11/Wed Nov 16 20:07:56 2005//
-/Makefile/1.1/Tue Jan 31 05:06:14 2006//
+/Makefile/1.1/Thu Mar 9 20:32:31 2006//
D
diff --git a/libpthread/linuxthreads/sysdeps/sh/CVS/Repository b/libpthread/linuxthreads/sysdeps/sh/CVS/Repository
index 37f96b985..2637cbf1a 100644
--- a/libpthread/linuxthreads/sysdeps/sh/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/sh/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/sh
+linuxthreads/linuxthreads/sysdeps/sh
diff --git a/libpthread/linuxthreads/sysdeps/sparc/CVS/Entries b/libpthread/linuxthreads/sysdeps/sparc/CVS/Entries
index 7dcfa02e2..f36f209fd 100644
--- a/libpthread/linuxthreads/sysdeps/sparc/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/sparc/CVS/Entries
@@ -2,4 +2,4 @@ D/sparc32////
D/sparc64////
/tcb-offsets.sym/1.1/Tue Nov 15 14:20:47 2005//
/tls.h/1.4/Tue Nov 15 14:20:47 2005//
-/Makefile/1.1/Tue Jan 31 05:06:14 2006//
+/Makefile/1.1/Thu Mar 9 20:32:31 2006//
diff --git a/libpthread/linuxthreads/sysdeps/sparc/CVS/Repository b/libpthread/linuxthreads/sysdeps/sparc/CVS/Repository
index 575bd926d..5e14412cc 100644
--- a/libpthread/linuxthreads/sysdeps/sparc/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/sparc/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/sparc
+linuxthreads/linuxthreads/sysdeps/sparc
diff --git a/libpthread/linuxthreads/sysdeps/sparc/sparc32/CVS/Repository b/libpthread/linuxthreads/sysdeps/sparc/sparc32/CVS/Repository
index cfce5a35f..4c70ee01d 100644
--- a/libpthread/linuxthreads/sysdeps/sparc/sparc32/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/sparc/sparc32/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/sparc/sparc32
+linuxthreads/linuxthreads/sysdeps/sparc/sparc32
diff --git a/libpthread/linuxthreads/sysdeps/sparc/sparc32/sparcv9/CVS/Entries b/libpthread/linuxthreads/sysdeps/sparc/sparc32/sparcv9/CVS/Entries
index 467d10a1c..cdcac8734 100644
--- a/libpthread/linuxthreads/sysdeps/sparc/sparc32/sparcv9/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/sparc/sparc32/sparcv9/CVS/Entries
@@ -1,3 +1,3 @@
/pspinlock.c/1.4/Tue Nov 15 14:20:47 2005//
-/Versions/1.1/Thu Feb 2 15:33:07 2006//
+/Versions/1.1/Thu Mar 9 20:32:31 2006//
D
diff --git a/libpthread/linuxthreads/sysdeps/sparc/sparc32/sparcv9/CVS/Repository b/libpthread/linuxthreads/sysdeps/sparc/sparc32/sparcv9/CVS/Repository
index 73a5bbb95..0706343ef 100644
--- a/libpthread/linuxthreads/sysdeps/sparc/sparc32/sparcv9/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/sparc/sparc32/sparcv9/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/sparc/sparc32/sparcv9
+linuxthreads/linuxthreads/sysdeps/sparc/sparc32/sparcv9
diff --git a/libpthread/linuxthreads/sysdeps/sparc/sparc64/CVS/Entries b/libpthread/linuxthreads/sysdeps/sparc/sparc64/CVS/Entries
index 34b1cb4f3..5c81680f4 100644
--- a/libpthread/linuxthreads/sysdeps/sparc/sparc64/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/sparc/sparc64/CVS/Entries
@@ -1,4 +1,4 @@
/pspinlock.c/1.5/Tue Nov 15 14:20:47 2005//
/pt-machine.h/1.20/Tue Nov 15 14:20:47 2005//
-/Versions/1.1/Thu Feb 2 15:33:07 2006//
+/Versions/1.1/Thu Mar 9 20:32:31 2006//
D
diff --git a/libpthread/linuxthreads/sysdeps/sparc/sparc64/CVS/Repository b/libpthread/linuxthreads/sysdeps/sparc/sparc64/CVS/Repository
index 534fc8ed2..199f13d5a 100644
--- a/libpthread/linuxthreads/sysdeps/sparc/sparc64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/sparc/sparc64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/sparc/sparc64
+linuxthreads/linuxthreads/sysdeps/sparc/sparc64
diff --git a/libpthread/linuxthreads/sysdeps/unix/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/CVS/Repository
index ff78050aa..1107021e3 100644
--- a/libpthread/linuxthreads/sysdeps/unix/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix
+linuxthreads/linuxthreads/sysdeps/unix
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/CVS/Repository
index fcc2f6785..c79244a66 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv
+linuxthreads/linuxthreads/sysdeps/unix/sysv
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Entries b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Entries
index 11642f1d6..00c1a4b80 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Entries
@@ -23,6 +23,6 @@ D/x86_64////
/allocrtsig.c/1.2/Wed Nov 30 19:58:15 2005//
/mq_notify.c/1.4/Thu Dec 29 06:43:12 2005//
/pt-sigsuspend.c/1.2/Result of merge//
-/Makefile/1.1/Tue Jan 31 05:06:14 2006//
-/Implies/1.1/Thu Feb 2 15:33:07 2006//
-/Versions/1.1/Thu Feb 2 15:33:07 2006//
+/Implies/1.1/Thu Mar 9 20:32:31 2006//
+/Makefile/1.1/Thu Mar 9 20:32:31 2006//
+/Versions/1.1/Thu Mar 9 20:32:31 2006//
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Repository
index c299f47ca..69c8f332a 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c
index af1581a4c..b9ada6417 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c
@@ -56,7 +56,7 @@ __libc_current_sigrtmin (void)
init ();
return current_rtmin;
}
-strong_alias (__libc_current_sigrtmin, __libc_current_sigrtmin_private);
+strong_alias (__libc_current_sigrtmin, __libc_current_sigrtmin_private)
libc_hidden_def (__libc_current_sigrtmin)
/* Return number of available real-time signal with lowest priority. */
@@ -67,7 +67,7 @@ __libc_current_sigrtmax (void)
init ();
return current_rtmax;
}
-strong_alias (__libc_current_sigrtmax, __libc_current_sigrtmax_private);
+strong_alias (__libc_current_sigrtmax, __libc_current_sigrtmax_private)
libc_hidden_def (__libc_current_sigrtmax)
/* Allocate real-time signal with highest/lowest available
@@ -84,4 +84,4 @@ __libc_allocate_rtsig (int high)
return high ? current_rtmin++ : current_rtmax--;
}
-strong_alias (__libc_allocate_rtsig, __libc_allocate_rtsig_private);
+strong_alias (__libc_allocate_rtsig, __libc_allocate_rtsig_private)
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/CVS/Entries b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/CVS/Entries
index 2c85dcb71..426a864b2 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/CVS/Entries
@@ -3,5 +3,5 @@ D/bits////
/pt-sigsuspend.S/1.1/Tue Nov 15 14:20:47 2005//
/sysdep-cancel.h/1.4/Tue Nov 15 14:20:47 2005//
/vfork.S/1.6/Tue Nov 15 14:20:47 2005//
-/Makefile/1.2/Tue Jan 31 05:06:14 2006//
-/Versions/1.1/Thu Feb 2 15:33:07 2006//
+/Makefile/1.2/Thu Mar 9 20:32:31 2006//
+/Versions/1.1/Thu Mar 9 20:32:31 2006//
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/CVS/Repository
index ea3d8bd8f..e0f0e1fe2 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/alpha
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/alpha
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/bits/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/bits/CVS/Repository
index c9cb0b5a8..d5bea0170 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/bits/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/bits/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/alpha/bits
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/alpha/bits
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/bits/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/bits/CVS/Repository
index 48f9f86f3..744368f6e 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/bits/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/bits/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/bits
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/bits
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/CVS/Repository
index 5ce63dd8e..bd284d884 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/hppa
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/hppa
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits/CVS/Repository
index 2c98e54a5..3af269b92 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/CVS/Repository
index 33e9cbc64..3c59e8f9a 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/i386
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/i386
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/CVS/Entries b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/CVS/Entries
index 8ab93c184..f86e299a7 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/CVS/Entries
@@ -5,5 +5,5 @@ D/bits////
/sysdep-cancel.h/1.10/Tue Nov 15 14:20:47 2005//
/vfork.S/1.4/Tue Nov 15 14:20:47 2005//
/dl-sysdep.h/-1.2/Wed Nov 16 20:05:14 2005//
-/Makefile/1.1/Tue Jan 31 05:06:14 2006//
-/Versions/1.1/Thu Feb 2 15:33:07 2006//
+/Makefile/1.1/Thu Mar 9 20:32:31 2006//
+/Versions/1.1/Thu Mar 9 20:32:31 2006//
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/CVS/Repository
index 5f9ce69df..702e072ce 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/ia64
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/ia64
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/bits/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/bits/CVS/Repository
index 74705b800..7d400367a 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/bits/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/ia64/bits/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/ia64/bits
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/ia64/bits
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/CVS/Repository
index 4c5c273db..b49644df7 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/m68k
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/m68k
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/CVS/Entries b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/CVS/Entries
index f54ac08b0..025ea7bd2 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/CVS/Entries
@@ -1,4 +1,4 @@
D/mips64////
/sysdep-cancel.h/1.3/Tue Nov 15 14:20:47 2005//
/vfork.S/1.2/Tue Nov 15 14:20:47 2005//
-/Makefile/1.3/Tue Jan 31 05:06:14 2006//
+/Makefile/1.3/Thu Mar 9 20:32:31 2006//
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/CVS/Repository
index dbbb76a98..728c4a069 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/mips
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/mips
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/CVS/Repository
index 3169327d3..2ff8b1e83 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/CVS/Entries b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/CVS/Entries
index 9378648aa..9e3e6982f 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/CVS/Entries
@@ -1,5 +1,5 @@
D/powerpc32////
D/powerpc64////
/ptlongjmp.c/1.2/Tue Nov 15 14:20:47 2005//
-/Makefile/1.1/Tue Jan 31 05:06:14 2006//
-/Versions/1.1/Thu Feb 2 15:33:07 2006//
+/Makefile/1.1/Thu Mar 9 20:32:31 2006//
+/Versions/1.1/Thu Mar 9 20:32:31 2006//
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/CVS/Repository
index 599f5c7f5..0421675dd 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/powerpc
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/powerpc
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/CVS/Repository
index 41baf84b8..1767aa1d9 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/CVS/Repository
index 3addc0e3e..75cc4ea08 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/CVS/Repository
index 294321382..1fef26c72 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/s390
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/s390
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/bits/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/bits/CVS/Repository
index 370c0ee15..9b25bf8bf 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/bits/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/bits/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/s390/bits
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/s390/bits
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/CVS/Repository
index 8294e87aa..3f723fe80 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/CVS/Repository
index ba9b38d45..a55952ebe 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/CVS/Repository
index 3471ea36b..9940f4c63 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/sh
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/sh
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/CVS/Entries b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/CVS/Entries
index 55ecc3fcd..b318ac3aa 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/CVS/Entries
@@ -3,4 +3,4 @@ D/sparc32////
D/sparc64////
/aio_cancel.c/1.1/Tue Nov 15 14:20:47 2005//
/fork.h/1.1/Tue Nov 15 14:20:47 2005//
-/Versions/1.1/Thu Feb 2 15:33:07 2006//
+/Versions/1.1/Thu Mar 9 20:32:31 2006//
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/CVS/Repository
index b24183f32..3ffb5e01f 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/sparc
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/sparc
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/bits/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/bits/CVS/Repository
index f4c6ad49a..4926e8ffb 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/bits/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/bits/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/sparc/bits
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/sparc/bits
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/CVS/Repository
index 21e8760c2..d2a6c4b65 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/CVS/Entries b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/CVS/Entries
index 15529026f..cf2c5c73e 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/CVS/Entries
@@ -1,5 +1,5 @@
/pt-sigsuspend.c/1.1/Tue Nov 15 14:20:47 2005//
/sysdep-cancel.h/1.7/Tue Nov 15 14:20:47 2005//
/vfork.S/1.6/Tue Nov 15 14:20:47 2005//
-/Makefile/1.4/Tue Jan 31 05:06:14 2006//
+/Makefile/1.4/Thu Mar 9 20:32:31 2006//
D
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/CVS/Repository
index a5b0ec61b..93f6ae918 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/x86_64/CVS/Entries b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/x86_64/CVS/Entries
index b973442b0..ad70d2e70 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/x86_64/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/x86_64/CVS/Entries
@@ -1,5 +1,5 @@
/pt-sigsuspend.c/1.1/Tue Nov 15 14:20:47 2005//
/sysdep-cancel.h/1.6/Tue Nov 15 14:20:47 2005//
/vfork.S/1.6/Tue Nov 15 14:20:47 2005//
-/Makefile/1.6/Tue Jan 31 05:06:14 2006/-ko/
+/Makefile/1.6/Thu Mar 9 20:32:31 2006/-ko/
D
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/x86_64/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/x86_64/CVS/Repository
index 89788b3f3..41542d88f 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/x86_64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/x86_64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/unix/sysv/linux/x86_64
+linuxthreads/linuxthreads/sysdeps/unix/sysv/linux/x86_64
diff --git a/libpthread/linuxthreads/sysdeps/x86_64/CVS/Entries b/libpthread/linuxthreads/sysdeps/x86_64/CVS/Entries
index 87d4a67db..b7c75089b 100644
--- a/libpthread/linuxthreads/sysdeps/x86_64/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/x86_64/CVS/Entries
@@ -2,6 +2,6 @@
/pt-machine.h/1.10/Tue Nov 15 14:20:47 2005/-ko/
/tcb-offsets.sym/1.1/Tue Nov 15 14:20:47 2005//
/tls.h/1.7/Tue Nov 15 14:20:47 2005//
-/Makefile/1.3/Tue Jan 31 05:06:14 2006/-ko/
-/Versions/1.1/Thu Feb 2 15:33:07 2006//
+/Makefile/1.3/Thu Mar 9 20:32:31 2006/-ko/
+/Versions/1.1/Thu Mar 9 20:32:31 2006//
D
diff --git a/libpthread/linuxthreads/sysdeps/x86_64/CVS/Repository b/libpthread/linuxthreads/sysdeps/x86_64/CVS/Repository
index 659d3082a..4e63a5dbf 100644
--- a/libpthread/linuxthreads/sysdeps/x86_64/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/x86_64/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/x86_64
+linuxthreads/linuxthreads/sysdeps/x86_64