[git commit prelink 1/1] nptl/mips64: Fix build when using mips64 and ABIs other than o32

[Khem Raj]

commit: http://git.uclibc.org/uClibc/commit/?id=094d82d3b3e8f8c8460a802b7a9548f3ae4fda46
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/prelink

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 libc/sysdeps/linux/common/Makefile.in              |    4 ++++
 .../sysdeps/unix/sysv/linux/mips/Makefile.arch     |    4 +++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
index 8a4add8..cf4cf87 100644
--- a/libc/sysdeps/linux/common/Makefile.in
+++ b/libc/sysdeps/linux/common/Makefile.in
@@ -44,6 +44,10 @@ ifeq ($(TARGET_ARCH),arm)
 CSRC := $(filter-out vfork.c, $(CSRC))
 else ifeq ($(TARGET_ARCH),x86_64)
 CSRC := $(filter-out vfork.c, $(CSRC))
+else ifeq ($(TARGET_ARCH),mips)
+ifeq ($(CONFIG_MIPS_O32_ABI),y)
+CSRC := $(filter-out waitpid.c, $(CSRC))
+endif
 else
 CSRC := $(filter-out waitpid.c, $(CSRC))
 endif
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch
index 84fe17e..fc26a8e 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch
@@ -10,7 +10,9 @@ libpthread_linux_arch_CSRC = pthread_once.c pt-__syscall_rt_sigaction.c
 
 libc_linux_arch_CSRC = fork.c
 libc_linux_arch_SSRC = clone.S vfork.S
-
+ifneq ($(CONFIG_MIPS_O32_ABI),y)
+libc_linux_arch_SSRC-OMIT = waitpid.S
+endif
 ASFLAGS += -DUSE___THREAD
 
 CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread
-- 
1.7.3.4