From 1f6601af6749d593c856db67c260293b8209063c Mon Sep 17 00:00:00 2001
From: Austin Foxley <austinf@cetoncorp.com>
Date: Wed, 16 Dec 2009 02:29:42 -0800
Subject: [PATCH] x86_64: no waitpid syscall exists, so use wait4

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
---
 libc/sysdeps/linux/common/Makefile.in               |  8 +++++---
 libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in | 11 ++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
index 64c2432f5..45c70baf6 100644
--- a/libc/sysdeps/linux/common/Makefile.in
+++ b/libc/sysdeps/linux/common/Makefile.in
@@ -36,10 +36,12 @@ endif
 
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 CSRC := $(filter-out fork.c getpid.c raise.c open.c close.c read.c write.c, $(CSRC))
-ifneq ($(TARGET_ARCH),arm)
-CSRC := $(filter-out waitpid.c, $(CSRC))
-else
+ifeq ($(TARGET_ARCH),arm)
 CSRC := $(filter-out vfork.c, $(CSRC))
+else ifeq ($(TARGET_ARCH),x86_64)
+#do nothing
+else
+CSRC := $(filter-out waitpid.c, $(CSRC))
 endif
 endif
 
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
index 186fefbea..770b94eab 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
@@ -20,11 +20,7 @@ libc_CSRC = libc_pthread_init.c libc_multiple_threads.c			\
 	    raise.c sleep.c jmp-unwind.c
 
 # These provide both a cancellable and a not cancellable implementation
-libc_SSRC = close.S open.S write.S read.S
-
-ifneq ($(TARGET_ARCH),arm)
-libc_SSRC += waitpid.S
-endif
+libc_SSRC = close.S open.S write.S read.S waitpid.S
 
 librt_CSRC := mq_notify.c timer_create.c timer_delete.c			 \
 	      timer_getoverr.c timer_gettime.c timer_routines.c		 \
@@ -37,6 +33,10 @@ libc_CSRC += libc-lowlevellock.c
 librt_CSRC := mq_notify.c
 endif
 
+ifeq ($(TARGET_ARCH),arm)
+libc_SSRC := $(filter-out waitpid.S,$(libc_SSRC))
+endif
+
 ifeq ($(TARGET_ARCH),mips)
 libpthread_CSRC += lowlevellock.c
 libc_CSRC += libc-lowlevellock.c
@@ -64,6 +64,7 @@ libpthread_CSRC := $(filter-out $(X86_PTHREAD_SPECIFIC),$(libpthread_CSRC))
 endif
 
 ifeq ($(TARGET_ARCH),x86_64)
+libc_SSRC := $(filter-out waitpid.S,$(libc_SSRC))
 X86_PTHREAD_SPECIFIC := sem_post.c sem_wait.c sem_timedwait.c sem_trywait.c
 libpthread_CSRC := $(filter-out $(X86_PTHREAD_SPECIFIC),$(libpthread_CSRC))
 librt_CSRC := mq_notify.c
-- 
2.11.0