diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-02-03 11:14:03 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-02-03 11:16:42 +0100 |
| commit | ac5e9d08f4f7aa004e48b9484c3005f0ecc0a105 (patch) | |
| tree | 32d30bd157f862792fdc4193eb2372e4d8cd0df4 /libpthread/nptl/sysdeps/unix/sysv | |
| parent | fd3120fb9ec9fe01d458962dca510eb81d06fcc8 (diff) | |
| parent | 269f901e62106e2d36acf4c2b79a9a5ec6d684ff (diff) | |
Merge remote branch 'origin/master' into prelink
* origin/master:
arm: fix the static link problem for ARM due to undefined __tls_get_addr
nios2: Name architecture correctly in endian.h header
nptl/mips64: Fix build when using mips64 and ABIs other than o32
mips: avoid segmentation fault when RLD_MAP is 0
libc: fix linker script generation for libubacktrace.so
stdio: fix diagnostic message
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/nptl/sysdeps/unix/sysv')
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch | 4 |
1 files changed, 3 insertions, 1 deletions
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 |