[uClibc-cvs] svn commit: trunk/uClibc: extra/Configs libpthread libpthread/lin etc...
andersen at uclibc.org
andersen at uclibc.org
Fri May 20 19:02:52 UTC 2005
Author: andersen
Date: 2005-05-20 13:02:51 -0600 (Fri, 20 May 2005)
New Revision: 10389
Log:
Back out nptl changes, which for now will be done in branches/uClibc-nptl
Removed:
trunk/uClibc/libpthread/nptl/
trunk/uClibc/libpthread/nptl_db/
Modified:
trunk/uClibc/Makefile
trunk/uClibc/extra/Configs/Config.in
trunk/uClibc/libpthread/linuxthreads/Makefile
trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h
Changeset:
Modified: trunk/uClibc/Makefile
===================================================================
--- trunk/uClibc/Makefile 2005-05-20 18:21:04 UTC (rev 10388)
+++ trunk/uClibc/Makefile 2005-05-20 19:02:51 UTC (rev 10389)
@@ -26,7 +26,7 @@
defconfig allyesconfig allnoconfig clean distclean \
release tags TAGS
TOPDIR=./
--include Rules.mak
+include Rules.mak
DIRS = ldso libc libcrypt libresolv libnsl libutil libm libpthread librt
ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
@@ -117,20 +117,6 @@
fi
$(MAKE) -C libc/sysdeps/linux/common headers
$(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
- (cd include; \
- $(LN) -fs ../libpthread/nptl/sysdeps/pthread/pthread.h .; \
- $(LN) -fs ../libpthread/nptl/semaphore.h .);
- (cd include/bits; \
- $(LN) -fs ../../libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/pthreadtypes.h .; \
- $(LN) -fs ../../libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/semaphore.h .);
-else
- (cd include; \
- $(LN) -fs ../libpthread/linuxthreads/sysdeps/pthread/pthread.h .; \
- $(LN) -fs ../libpthread/linuxthreads/semaphore.h .);
- (cd include/bits; \
- $(LN) -fs ../../libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h .);
-endif
# Command used to download source code
WGET:=wget --passive-ftp
@@ -360,7 +346,6 @@
done; \
fi;
@$(RM) include/linux include/asm*
- @$(RM) include/pthread.h include/semaphore.h
@if [ -d libc/sysdeps/linux/$(TARGET_ARCH) ]; then \
$(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) clean; \
fi;
Modified: trunk/uClibc/extra/Configs/Config.in
===================================================================
--- trunk/uClibc/extra/Configs/Config.in 2005-05-20 18:21:04 UTC (rev 10388)
+++ trunk/uClibc/extra/Configs/Config.in 2005-05-20 19:02:51 UTC (rev 10389)
@@ -297,27 +297,6 @@
If your applications require pthreads, answer Y.
-config PTHREADS_NATIVE
- bool "Native POSIX Threading (NPTL) Support"
- depends on UCLIBC_HAS_THREADS
- default n
- help
- If you want to compile uClibc with NPTL support, then answer Y.
-
- IMPORTANT NOTE! NPTL requires a Linux 2.6 kernel, binutils
- at least version 2.16 and GCC with at least version 4.1.0. NPTL
- will not work with older versions of any above sources. If you
- ignore any of these guidelines, you do so at your own risk. Do
- not ask for help on any of the development mailing lists.
-
- !!!! WARNING !!!! BIG FAT WARNING !!!! REALLY BIG FAT WARNING !!!!
-
- This is experimental code and at times it may not even build and
- even if it does it might decide to do random damage. This code is
- potentially hazardous to your health and sanity. It will remain
- that way until further notice at which point this notice will
- disappear. Thank you for your support and for not smoking.
-
config PTHREADS_DEBUG_SUPPORT
bool "Build pthreads debugging support"
default n
Modified: trunk/uClibc/libpthread/linuxthreads/Makefile
===================================================================
--- trunk/uClibc/libpthread/linuxthreads/Makefile 2005-05-20 18:21:04 UTC (rev 10388)
+++ trunk/uClibc/libpthread/linuxthreads/Makefile 2005-05-20 19:02:51 UTC (rev 10389)
@@ -39,7 +39,10 @@
# set up system dependencies include dirs (NOTE: order matters!)
PTDIR = $(TOPDIR)libpthread/linuxthreads/
-SYSDEPINC = -I$(PTDIR)sysdeps/pthread \
+SYSDEPINC = -I$(PTDIR)sysdeps/unix/sysv/linux \
+ -I$(PTDIR)sysdeps/pthread \
+ -I$(PTDIR)sysdeps/unix/sysv \
+ -I$(PTDIR)sysdeps/unix/unix \
-I$(PTDIR)sysdeps/$(TARGET_ARCH) \
-I$(PTDIR)sysdeps \
-I$(TOPDIR)libc/sysdeps/linux/$(TARGET_ARCH)
Modified: trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h
===================================================================
--- trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h 2005-05-20 18:21:04 UTC (rev 10388)
+++ trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h 2005-05-20 19:02:51 UTC (rev 10389)
@@ -25,9 +25,8 @@
/* Fast locks (not abstract because mutexes and conditions aren't abstract). */
struct _pthread_fastlock
{
- long int __status; /* "Free" or "taken" or head of waiting list */
- int __spinlock; /* Used by compare_and_swap emulation. Also,
- adaptive SMP lock stores spin count here. */
+ long int __status; /* "Free" or "taken" or head of waiting list */
+ int __spinlock; /* For compare-and-swap emulation */
};
#ifndef _PTHREAD_DESCR_DEFINED
@@ -38,7 +37,7 @@
/* Attributes for threads. */
-typedef struct __pthread_attr_s
+typedef struct
{
int __detachstate;
int __schedpolicy;
@@ -53,20 +52,10 @@
/* Conditions (not abstract because of PTHREAD_COND_INITIALIZER */
-
-#ifdef __GLIBC_HAVE_LONG_LONG
-__extension__ typedef long long __pthread_cond_align_t;
-#else
-typedef long __pthread_cond_align_t;
-#endif
-
typedef struct
{
struct _pthread_fastlock __c_lock; /* Protect against concurrent access */
_pthread_descr __c_waiting; /* Threads waiting on this condition */
- char __padding[48 - sizeof (struct _pthread_fastlock)
- - sizeof (_pthread_descr) - sizeof (__pthread_cond_align_t)];
- __pthread_cond_align_t __align;
} pthread_cond_t;
@@ -104,7 +93,7 @@
typedef int pthread_once_t;
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K
+#ifdef __USE_UNIX98
/* Read-write locks. */
typedef struct _pthread_rwlock_t
{
@@ -126,26 +115,7 @@
} pthread_rwlockattr_t;
#endif
-#ifdef __USE_XOPEN2K
-/* POSIX spinlock data type. */
-typedef volatile int pthread_spinlock_t;
-/* POSIX barrier. */
-typedef struct {
- struct _pthread_fastlock __ba_lock; /* Lock to guarantee mutual exclusion */
- int __ba_required; /* Threads needed for completion */
- int __ba_present; /* Threads waiting */
- _pthread_descr __ba_waiting; /* Queue of waiting threads */
-} pthread_barrier_t;
-
-/* barrier attribute */
-typedef struct {
- int __pshared;
-} pthread_barrierattr_t;
-
-#endif
-
-
/* Thread identifiers */
typedef unsigned long int pthread_t;
More information about the uClibc-cvs
mailing list