Index: git/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch
===================================================================
--- git.orig/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch	2010-07-02 19:22:32.065550000 -0700
+++ git/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch	2010-07-02 19:24:37.915550000 -0700
@@ -11,6 +11,13 @@ libpthread_linux_arch_CSRC = pthread_spi
 libc_linux_arch_CSRC = fork.c
 libc_linux_arch_SSRC = clone.S vfork.S
 
+libpthread_linux_arch_SSRC += i486/lowlevellock.S i486/pthread_barrier_wait.S i486/pthread_cond_signal.S i486/pthread_cond_broadcast.S \
+                   i486/lowlevelrobustlock.S i486/sem_post.S i486/sem_timedwait.S \
+                   i486/sem_trywait.S i486/sem_wait.S i486/pthread_rwlock_rdlock.S i486/pthread_rwlock_wrlock.S \
+                   i486/pthread_rwlock_timedrdlock.S i486/pthread_rwlock_timedwrlock.S i486/pthread_rwlock_unlock.S
+#i486/pthread_cond_timedwait.S i486/pthread_cond_wait.S
+                                                                                       libc_linux_arch_SSRC += i486/libc-lowlevellock.S
+
 ASFLAGS += -DUSE___THREAD
 CFLAGS += $(SSP_ALL_CFLAGS)
 
Index: git/libpthread/nptl/sysdeps/Makefile.commonarch
===================================================================
--- git.orig/libpthread/nptl/sysdeps/Makefile.commonarch	2010-07-02 20:42:03.295550001 -0700
+++ git/libpthread/nptl/sysdeps/Makefile.commonarch	2010-07-02 20:45:22.345550001 -0700
@@ -17,6 +17,7 @@ endif
 -include $(libpthread_arch_DIR)/Makefile.arch
 libpthread_arch_SSRC := $(filter-out librt-%,$(filter-out libc-%,$(notdir $(wildcard $(libpthread_arch_DIR)/*.S))))
 libpthread_arch_CSRC := $(filter-out librt-%,$(filter-out libc-%,$(notdir $(wildcard $(libpthread_arch_DIR)/*.c))))
+libpthread_arch_CSRC := $(filter-out gen_tcb-offsets.c, $(libpthread_arch_CSRC))
 ifneq ($(TARGET_SUBARCH),)
 libpthread_subarch_SSRC := $(notdir $(wildcard $(libpthread_subarch_DIR)/*.S))
 libpthread_arch_SSRC := $(filter-out $(libpthread_subarch_SSRC),$(libpthread_arch_SSRC))