[PATCH] libc/{arm, i386}/Makefile.arch: Don't build 64-bit code if LFS is disabled

Markos Chandras markos.chandras at gmail.com
Sat Feb 9 10:40:42 UTC 2013


On 17 January 2013 15:15, Markos Chandras <markos.chandras at gmail.com> wrote:
> From: Markos Chandras <markos.chandras at imgtec.com>
>
> 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 <markos.chandras at imgtec.com>
> ---
>  libc/sysdeps/linux/arm/Makefile.arch  | 3 ++-
>  libc/sysdeps/linux/i386/Makefile.arch | 5 +++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch
> index 3b6c168..7d35a23 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 e1739e1..581e10a 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
> --
> 1.8.1.1
>
>
> _______________________________________________
> uClibc mailing list
> uClibc at uclibc.org
> http://lists.busybox.net/mailman/listinfo/uclibc

Ping? any chance for this patch to be applied on master branch as the
build is now broken on !LFS x86/arm configurations?

-- 
Regards,
Markos Chandras


More information about the uClibc mailing list