summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/common/Makefile.in
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-09-24 09:02:41 +0200
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-09-24 09:02:41 +0200
commit8d29ef117dba66ab67419a69d272779d50f147f0 (patch)
treea8df75081898112b27252393792156124c89a84c /libc/sysdeps/linux/common/Makefile.in
parentb9766aa08c90b6718d5497d6a6cf9e6f737e5141 (diff)
parent74407db52d3953c7f3c6b8a53661cfc96cb07e22 (diff)
Merge commit 'origin/master' into prelink
Conflicts: ldso/ldso/sh/elfinterp.c Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc/sysdeps/linux/common/Makefile.in')
-rw-r--r--libc/sysdeps/linux/common/Makefile.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
index 1711e8025..4222912fc 100644
--- a/libc/sysdeps/linux/common/Makefile.in
+++ b/libc/sysdeps/linux/common/Makefile.in
@@ -26,12 +26,16 @@ endif
ifneq ($(UCLIBC_LINUX_SPECIFIC),y)
# we need these internally: fstatfs.c statfs.c
-CSRC := $(filter-out capget.c capset.c inotify.c ioperm.c iopl.c madvise.c \
+CSRC := $(filter-out capget.c capset.c inotify.c ioperm.c iopl.c \
modify_ldt.c personality.c ppoll.c prctl.c readahead.c reboot.c \
remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \
sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \
splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c,$(CSRC))
+ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y)
+# we need madvise.c in NPTL
+CSRC := $(filter-pout madvise.c,$(CSRC))
+endif
endif
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)