From dcd8e7e8c9c5c5de727c9f1ff9499248cdf6f40e Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 17 Jan 2013 15:15:17 +0000 Subject: libc/{arm, i386}/Makefile.arch: Don't build 64-bit code if LFS is disabled Fixes the following compilation error: _lfs_64.h: # error Do not include this header in files not built when LFS is disabled Signed-off-by: Markos Chandras Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/arm/Makefile.arch | 3 ++- libc/sysdeps/linux/i386/Makefile.arch | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch index 3b6c168c8..7d35a2356 100644 --- a/libc/sysdeps/linux/arm/Makefile.arch +++ b/libc/sysdeps/linux/arm/Makefile.arch @@ -9,9 +9,10 @@ CSRC-y := brk.c ioperm.c iopl.c __syscall_error.c sigaction.c SSRC-y := \ __longjmp.S setjmp.S bsd-setjmp.S \ - bsd-_setjmp.S sigrestorer.S mmap64.S \ + bsd-_setjmp.S sigrestorer.S \ vfork.S clone.S +SSRC-$(UCLIBC_HAS_LFS) += mmap64.S SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-aeabi_read_tp.S libc-thumb_atomics.S CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise.c CSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.c diff --git a/libc/sysdeps/linux/i386/Makefile.arch b/libc/sysdeps/linux/i386/Makefile.arch index e1739e193..581e10a5e 100644 --- a/libc/sysdeps/linux/i386/Makefile.arch +++ b/libc/sysdeps/linux/i386/Makefile.arch @@ -9,8 +9,9 @@ CSRC-y := brk.c __syscall_error.c sigaction.c SSRC-y := \ __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ - sync_file_range.S syscall.S mmap.S mmap64.S + sync_file_range.S syscall.S mmap.S -SSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.S +SSRC-$(UCLIBC_HAS_LFS) += mmap64.S +SSRC-$(if $(findstring yy,$(UCLIBC_HAS_ADVANCED_REALTIME)$(UCLIBC_HAS_LFS)),y) += posix_fadvise64.S SSRC-$(if $(UCLIBC_HAS_THREADS_NATIVE),,y) += vfork.S clone.S SSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.S setcontext.S getcontext.S swapcontext.S -- cgit v1.2.3