diff --git a/Config.uk b/Config.uk
index 124a23c..c2e06b3 100644
--- a/Config.uk
+++ b/Config.uk
@@ -1,7 +1,7 @@
 menuconfig LIBPTHREAD_EMBEDDED
 	bool "libpthread-embedded - An embedded pthread library"
 	default n
-	select LIBNOLIBC if !HAVE_LIBC
+	select LIBNEWLIBC
 	select LIBUKDEBUG
 	select LIBUKALLOC
 	select LIBUKSCHED
diff --git a/Makefile.uk b/Makefile.uk
index da0020d..5442c22 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -21,311 +21,311 @@
 ################################################################################
 # Library registration
 ################################################################################
-$(eval $(call addlib_s,libpthread-embedded,$(CONFIG_LIBPTHREAD_EMBEDDED)))
+$(eval $(call addlib_s,libpthread_embedded,$(CONFIG_LIBPTHREAD_EMBEDDED)))
 
 ################################################################################
 # Sources
 ################################################################################
-LIBPTHREAD-EMBEDDED_VERSION=44b41d760a433915d70a7be9809651b0a65e001d
-LIBPTHREAD-EMBEDDED_URL=https://github.com/RWTH-OS/pthread-embedded/archive/$(LIBPTHREAD-EMBEDDED_VERSION).zip
-LIBPTHREAD-EMBEDDED_PATCHDIR=$(LIBPTHREAD-EMBEDDED_BASE)/patches
-$(eval $(call fetch,libpthread-embedded,$(LIBPTHREAD-EMBEDDED_URL)))
-$(eval $(call patch,libpthread-embedded,$(LIBPTHREAD-EMBEDDED_PATCHDIR),pthread-embedded-$(LIBPTHREAD-EMBEDDED_VERSION)))
+LIBPTHREAD_EMBEDDED_VERSION=44b41d760a433915d70a7be9809651b0a65e001d
+LIBPTHREAD_EMBEDDED_URL=https://github.com/RWTH-OS/pthread-embedded/archive/$(LIBPTHREAD_EMBEDDED_VERSION).zip
+LIBPTHREAD_EMBEDDED_PATCHDIR=$(LIBPTHREAD_EMBEDDED_BASE)/patches
+$(eval $(call fetch,libpthread_embedded,$(LIBPTHREAD_EMBEDDED_URL)))
+$(eval $(call patch,libpthread_embedded,$(LIBPTHREAD_EMBEDDED_PATCHDIR),pthread-embedded-$(LIBPTHREAD_EMBEDDED_VERSION)))
 
 ################################################################################
 # Helpers
 ################################################################################
-LIBPTHREAD-EMBEDDED_EXTRACTED = $(LIBPTHREAD-EMBEDDED_ORIGIN)/pthread-embedded-$(LIBPTHREAD-EMBEDDED_VERSION)
+LIBPTHREAD_EMBEDDED_EXTRACTED = $(LIBPTHREAD_EMBEDDED_ORIGIN)/pthread-embedded-$(LIBPTHREAD_EMBEDDED_VERSION)
 
 ################################################################################
 # Library includes
 ################################################################################
-CINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED)   += -I$(LIBPTHREAD-EMBEDDED_BASE)/include
-CINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED)   += -I$(LIBPTHREAD-EMBEDDED_EXTRACTED)
-CINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED)   += -I$(LIBPTHREAD-EMBEDDED_EXTRACTED)/platform/helper
+CINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED)   += -I$(LIBPTHREAD_EMBEDDED_BASE)/include
+CINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED)   += -I$(LIBPTHREAD_EMBEDDED_EXTRACTED)
+CINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED)   += -I$(LIBPTHREAD_EMBEDDED_EXTRACTED)/platform/helper
 
-CXXINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED) += -I$(LIBPTHREAD-EMBEDDED_BASE)/include
-CXXINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED) += -I$(LIBPTHREAD-EMBEDDED_EXTRACTED)
-CXXINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED) += -I$(LIBPTHREAD-EMBEDDED_EXTRACTED)/platform/helper
+CXXINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED) += -I$(LIBPTHREAD_EMBEDDED_BASE)/include
+CXXINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED) += -I$(LIBPTHREAD_EMBEDDED_EXTRACTED)
+CXXINCLUDES-$(CONFIG_LIBPTHREAD_EMBEDDED) += -I$(LIBPTHREAD_EMBEDDED_EXTRACTED)/platform/helper
 
 ################################################################################
 # Global flags
 ################################################################################
-LIBPTHREAD-EMBEDDED_SUPPRESS_FLAGS += -Wno-unused-parameter \
+LIBPTHREAD_EMBEDDED_SUPPRESS_FLAGS += -Wno-unused-parameter \
 -Wno-unused-variable -Wno-unused-value -Wno-unused-function \
 -Wno-missing-field-initializers -Wno-strict-aliasing
 
-LIBPTHREAD-EMBEDDED_CFLAGS-y   += $(LIBPTHREAD-EMBEDDED_SUPPRESS_FLAGS) \
+LIBPTHREAD_EMBEDDED_CFLAGS-y   += $(LIBPTHREAD_EMBEDDED_SUPPRESS_FLAGS) \
 	-Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
-LIBPTHREAD-EMBEDDED_CXXFLAGS-y += $(LIBPTHREAD-EMBEDDED_SUPPRESS_FLAGS)
+LIBPTHREAD_EMBEDDED_CXXFLAGS-y += $(LIBPTHREAD_EMBEDDED_SUPPRESS_FLAGS)
 
 ################################################################################
 # OS dependencies code - Glue between Unikraft and pthread-embedded
 ################################################################################
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_BASE)/pte_osal.c|glue
-LIBPTHREAD-EMBEDDED_PTE_OSAL_GLUE_FLAGS-$(call gcc_version_ge,5,0) += -Wno-incompatible-pointer-types
-LIBPTHREAD-EMBEDDED_PTE_OSAL_GLUE_FLAGS-$(call gcc_version_ge,8,0) += -Wno-cast-function-type
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_BASE)/pte_osal.c|glue
+LIBPTHREAD_EMBEDDED_PTE_OSAL_GLUE_FLAGS-$(call gcc_version_ge,5,0) += -Wno-incompatible-pointer-types
+LIBPTHREAD_EMBEDDED_PTE_OSAL_GLUE_FLAGS-$(call gcc_version_ge,8,0) += -Wno-cast-function-type
 
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_BASE)/attributes.c|glue
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_BASE)/pthread_atfork.c|glue
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_BASE)/pthread_sigmask.c|glue
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_BASE)/pthread_condattr.c|glue
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_BASE)/attributes.c|glue
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_BASE)/pthread_atfork.c|glue
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_BASE)/pthread_sigmask.c|glue
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_BASE)/pthread_condattr.c|glue
 
 ################################################################################
 # pthread-embedded code
 ################################################################################
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/cleanup.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/create.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/global.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/platform/helper/tls-helper.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_callUserDestroyRoutines.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_cancellable_wait.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_cond_check_need_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_detach.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_getprocessors.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_is_attr.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_mutex_check_need_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_new.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_relmillisecs.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_reuse.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_rwlock_cancelwrwait.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_rwlock_check_need_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_spinlock_check_need_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_threadDestroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_threadStart.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_throw.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_tkAssocCreate.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pte_tkAssocDestroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_getdetachstate.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_getinheritsched.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_getschedparam.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_getschedpolicy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_getscope.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_getstackaddr.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_getstacksize.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_setdetachstate.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_setinheritsched.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_setschedparam.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_setschedpolicy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_setscope.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_setstackaddr.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_attr_setstacksize.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_barrierattr_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_barrierattr_getpshared.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_barrierattr_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_barrierattr_setpshared.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_barrier_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_barrier_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_barrier_wait.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_cancel.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_condattr_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_condattr_getpshared.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_condattr_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_condattr_setpshared.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_cond_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_cond_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_cond_signal.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_cond_wait.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_delay_np.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_detach.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_equal.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_exit.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_getconcurrency.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_getschedparam.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_getspecific.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_join.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_key_create.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_key_delete.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_kill.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutexattr_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutexattr_getkind_np.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutexattr_getpshared.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutexattr_gettype.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutexattr_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutexattr_setkind_np.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutexattr_setpshared.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutexattr_settype.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutex_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutex_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutex_lock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutex_timedlock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutex_trylock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_mutex_unlock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_num_processors_np.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_once.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlockattr_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlockattr_getpshared.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlockattr_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlockattr_setpshared.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlock_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlock_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlock_rdlock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlock_timedrdlock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlock_timedwrlock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlock_tryrdlock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlock_trywrlock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlock_unlock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_rwlock_wrlock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_self.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_setcancelstate.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_setcanceltype.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_setconcurrency.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_setschedparam.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_setspecific.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_spin_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_spin_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_spin_lock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_spin_trylock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_spin_unlock.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_terminate.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_testcancel.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/pthread_timechange_handler_np.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sched_get_priority_max.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sched_get_priority_min.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sched_setscheduler.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_close.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_destroy.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_getvalue.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_init.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_open.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_post_multiple.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_post.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_timedwait.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_trywait.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_unlink.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/sem_wait.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/cleanup.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/create.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/global.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/platform/helper/tls-helper.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_callUserDestroyRoutines.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_cancellable_wait.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_cond_check_need_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_detach.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_getprocessors.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_is_attr.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_mutex_check_need_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_new.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_relmillisecs.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_reuse.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_rwlock_cancelwrwait.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_rwlock_check_need_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_spinlock_check_need_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_threadDestroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_threadStart.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_throw.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_tkAssocCreate.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pte_tkAssocDestroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_getdetachstate.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_getinheritsched.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_getschedparam.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_getschedpolicy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_getscope.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_getstackaddr.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_getstacksize.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_setdetachstate.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_setinheritsched.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_setschedparam.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_setschedpolicy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_setscope.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_setstackaddr.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_attr_setstacksize.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_barrierattr_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_barrierattr_getpshared.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_barrierattr_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_barrierattr_setpshared.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_barrier_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_barrier_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_barrier_wait.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_cancel.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_condattr_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_condattr_getpshared.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_condattr_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_condattr_setpshared.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_cond_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_cond_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_cond_signal.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_cond_wait.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_delay_np.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_detach.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_equal.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_exit.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_getconcurrency.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_getschedparam.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_getspecific.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_join.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_key_create.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_key_delete.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_kill.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutexattr_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutexattr_getkind_np.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutexattr_getpshared.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutexattr_gettype.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutexattr_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutexattr_setkind_np.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutexattr_setpshared.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutexattr_settype.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutex_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutex_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutex_lock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutex_timedlock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutex_trylock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_mutex_unlock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_num_processors_np.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_once.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlockattr_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlockattr_getpshared.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlockattr_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlockattr_setpshared.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlock_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlock_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlock_rdlock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlock_timedrdlock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlock_timedwrlock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlock_tryrdlock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlock_trywrlock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlock_unlock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_rwlock_wrlock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_self.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_setcancelstate.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_setcanceltype.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_setconcurrency.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_setschedparam.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_setspecific.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_spin_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_spin_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_spin_lock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_spin_trylock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_spin_unlock.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_terminate.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_testcancel.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/pthread_timechange_handler_np.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sched_get_priority_max.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sched_get_priority_min.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sched_setscheduler.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_close.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_destroy.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_getvalue.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_init.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_open.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_post_multiple.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_post.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_timedwait.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_trywait.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_unlink.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/sem_wait.c
 
 ifeq ($(CONFIG_LIBPTHREAD_EMBEDDED_UTEST),y)
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/barrier1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/barrier2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/barrier3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/barrier4.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/barrier5.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/benchlib.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/benchtest1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/benchtest2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/benchtest3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/benchtest4.c
-#LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/benchtest5.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cancel1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cancel2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cancel3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cancel4.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cancel5.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cancel6a.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cancel6d.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cleanup0.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cleanup1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cleanup2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/cleanup3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar1_1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar1_2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar2_1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar3_1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar3_2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar3_3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar4.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar5.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar6.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar7.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar8.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/condvar9.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/count1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/create1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/create2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/create3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/delay1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/delay2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/detach1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/equal1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/errno1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/exception1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/exception2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/exception3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/exit1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/exit2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/exit3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/exit4.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/exit5.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/inherit1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/join0.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/join1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/join2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/join3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/join4.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/kill1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex1e.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex1n.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex1r.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex2e.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex2r.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex3e.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex3r.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex4.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex5.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex6.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex6e.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex6es.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex6n.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex6r.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex6rs.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex6s.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex7.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex7e.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex7n.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex7r.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex8.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex8e.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex8n.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/mutex8r.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/once1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/once2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/once3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/once4.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/priority1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/priority2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/reuse1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/reuse2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock2_t.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock3_t.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock4.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock4_t.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock5.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock5_t.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock6.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock6_t2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock6_t.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock7.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/rwlock8.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/self1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/self2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/semaphore1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/semaphore2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/semaphore3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/semaphore4.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/semaphore4t.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/semaphore5.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/semaphore6.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/spin1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/spin2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/spin3.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/spin4.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/stress1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/test_main.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/tsd1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/tsd2.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/valid1.c
-LIBPTHREAD-EMBEDDED_SRCS-y += $(LIBPTHREAD-EMBEDDED_EXTRACTED)/tests/valid2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/barrier1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/barrier2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/barrier3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/barrier4.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/barrier5.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/benchlib.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/benchtest1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/benchtest2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/benchtest3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/benchtest4.c
+#LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/benchtest5.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cancel1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cancel2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cancel3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cancel4.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cancel5.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cancel6a.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cancel6d.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cleanup0.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cleanup1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cleanup2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/cleanup3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar1_1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar1_2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar2_1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar3_1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar3_2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar3_3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar4.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar5.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar6.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar7.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar8.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/condvar9.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/count1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/create1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/create2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/create3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/delay1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/delay2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/detach1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/equal1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/errno1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/exception1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/exception2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/exception3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/exit1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/exit2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/exit3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/exit4.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/exit5.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/inherit1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/join0.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/join1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/join2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/join3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/join4.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/kill1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex1e.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex1n.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex1r.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex2e.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex2r.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex3e.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex3r.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex4.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex5.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex6.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex6e.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex6es.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex6n.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex6r.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex6rs.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex6s.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex7.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex7e.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex7n.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex7r.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex8.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex8e.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex8n.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/mutex8r.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/once1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/once2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/once3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/once4.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/priority1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/priority2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/reuse1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/reuse2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock2_t.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock3_t.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock4.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock4_t.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock5.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock5_t.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock6.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock6_t2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock6_t.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock7.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/rwlock8.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/self1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/self2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/semaphore1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/semaphore2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/semaphore3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/semaphore4.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/semaphore4t.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/semaphore5.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/semaphore6.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/spin1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/spin2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/spin3.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/spin4.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/stress1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/test_main.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/tsd1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/tsd2.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/valid1.c
+LIBPTHREAD_EMBEDDED_SRCS-y += $(LIBPTHREAD_EMBEDDED_EXTRACTED)/tests/valid2.c
 endif
diff --git a/pte_osal.c b/pte_osal.c
index 466b221..a33d42e 100644
--- a/pte_osal.c
+++ b/pte_osal.c
@@ -64,7 +64,7 @@ typedef struct pte_thread_data {
 
 static bool initialized /* false */;
 
-static int pthread_initcall(void)
+static int pthread_initcall(struct uk_init_ctx *ictx __unused)
 {
 	int result;
 
@@ -75,7 +75,7 @@ static int pthread_initcall(void)
 		initialized = true;
 	return result;
 }
-uk_early_initcall_prio(pthread_initcall, UK_PRIO_EARLIEST);
+uk_early_initcall_prio(pthread_initcall, 0x0, UK_PRIO_EARLIEST);
 
 pte_osResult pte_osInit(void)
 {