diff options
| author | Khem Raj <raj.khem@gmail.com> | 2011-01-29 09:14:53 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2011-01-29 09:14:53 -0800 |
| commit | 094d82d3b3e8f8c8460a802b7a9548f3ae4fda46 (patch) | |
| tree | fcdd75ebf35a73b2f04e6c6643e5d8dea35ee118 | |
| parent | 9657b26d293370032604891a361d944b8bf0b234 (diff) | |
nptl/mips64: Fix build when using mips64 and ABIs other than o32
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile.in | 4 | ||||
| -rw-r--r-- | libpthread/nptl/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 8a4add813..cf4cf8708 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 84fe17e8e..fc26a8e13 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 |