From 47b61ca513022b7d89baf810692475c9f0673cca Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Wed, 29 Jul 2009 18:50:58 +0200 Subject: build: Include Makefile.commonarch from common Makefile.in Avoid including akefile.commonarch in each Makefile.arch. Include it instead from Makefile.in just after the arch specific Makefile.arch Signed-off-by: Carmelo Amoroso --- libc/sysdeps/linux/Makefile.in | 1 + libc/sysdeps/linux/alpha/Makefile.arch | 2 -- libc/sysdeps/linux/arm/Makefile.arch | 2 -- libc/sysdeps/linux/avr32/Makefile.arch | 2 -- libc/sysdeps/linux/bfin/Makefile.arch | 2 -- libc/sysdeps/linux/cris/Makefile.arch | 2 -- libc/sysdeps/linux/hppa/Makefile.arch | 2 -- libc/sysdeps/linux/i386/Makefile.arch | 2 -- libc/sysdeps/linux/ia64/Makefile.arch | 2 -- libc/sysdeps/linux/m68k/Makefile.arch | 2 -- libc/sysdeps/linux/mips/Makefile.arch | 2 -- libc/sysdeps/linux/nios/Makefile.arch | 2 -- libc/sysdeps/linux/nios2/Makefile.arch | 2 -- libc/sysdeps/linux/powerpc/Makefile.arch | 2 -- libc/sysdeps/linux/sh/Makefile.arch | 2 -- libc/sysdeps/linux/sh64/Makefile.arch | 2 -- libc/sysdeps/linux/sparc/Makefile.arch | 2 -- libc/sysdeps/linux/vax/Makefile.arch | 2 -- libc/sysdeps/linux/x86_64/Makefile.arch | 2 -- libc/sysdeps/linux/xtensa/Makefile.arch | 2 -- 20 files changed, 1 insertion(+), 38 deletions(-) diff --git a/libc/sysdeps/linux/Makefile.in b/libc/sysdeps/linux/Makefile.in index d2a980c16..c2d35a0cf 100644 --- a/libc/sysdeps/linux/Makefile.in +++ b/libc/sysdeps/linux/Makefile.in @@ -7,4 +7,5 @@ # order is relevant -include $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/Makefile.arch +include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch include $(top_srcdir)libc/sysdeps/linux/common/Makefile.in diff --git a/libc/sysdeps/linux/alpha/Makefile.arch b/libc/sysdeps/linux/alpha/Makefile.arch index 5097008ab..d9defc30d 100644 --- a/libc/sysdeps/linux/alpha/Makefile.arch +++ b/libc/sysdeps/linux/alpha/Makefile.arch @@ -11,5 +11,3 @@ SSRC := \ __longjmp.S brk.S bsd-_setjmp.S bsd-setjmp.S clone.S \ divl.S divq.S pipe.S reml.S remq.S __syscall_rt_sigaction.S setjmp.S \ syscall.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch index a3b6fc4d8..8f1c3b83f 100644 --- a/libc/sysdeps/linux/arm/Makefile.arch +++ b/libc/sysdeps/linux/arm/Makefile.arch @@ -24,8 +24,6 @@ else CSRC += syscall.c endif -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch - ifeq ($(CONFIG_ARM_EABI),y) libc-static-y += $(ARCH_OUT)/aeabi_lcsts.o $(ARCH_OUT)/aeabi_math.o \ $(ARCH_OUT)/aeabi_sighandlers.o diff --git a/libc/sysdeps/linux/avr32/Makefile.arch b/libc/sysdeps/linux/avr32/Makefile.arch index 44fc01ebf..bc5f62550 100644 --- a/libc/sysdeps/linux/avr32/Makefile.arch +++ b/libc/sysdeps/linux/avr32/Makefile.arch @@ -9,5 +9,3 @@ CSRC := brk.c clone.c mmap.c sigaction.c SSRC := __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ sigrestorer.S syscall.S vfork.S - -include $(top_srcdir)/libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/bfin/Makefile.arch b/libc/sysdeps/linux/bfin/Makefile.arch index c44a7dcda..242703757 100644 --- a/libc/sysdeps/linux/bfin/Makefile.arch +++ b/libc/sysdeps/linux/bfin/Makefile.arch @@ -11,5 +11,3 @@ CSRC := bsdsetjmp.c clone.c \ SSRC := __longjmp.S setjmp.S bsd-_setjmp.S ARCH_HEADERS := bfin_fixed_code.h bfin_l1layout.h bfin_sram.h - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/cris/Makefile.arch b/libc/sysdeps/linux/cris/Makefile.arch index 850c83de5..43e191205 100644 --- a/libc/sysdeps/linux/cris/Makefile.arch +++ b/libc/sysdeps/linux/cris/Makefile.arch @@ -11,5 +11,3 @@ SSRC := setjmp.S __longjmp.S clone.S sysdep.S syscall.S ifeq ($(UNIFIED_SYSCALL),y) SSRC += __uClibc_syscall.S endif - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/hppa/Makefile.arch b/libc/sysdeps/linux/hppa/Makefile.arch index 9739e74d7..2b0cf09a8 100644 --- a/libc/sysdeps/linux/hppa/Makefile.arch +++ b/libc/sysdeps/linux/hppa/Makefile.arch @@ -9,5 +9,3 @@ CSRC := __syscall_error.c brk.c mmap.c syscall.c SSRC := __longjmp.S bsd-_setjmp.S bsd-setjmp.S clone.S setjmp.S \ add_n.s lshift.s rshift.s sub_n.s udiv_qrnnd.s - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/i386/Makefile.arch b/libc/sysdeps/linux/i386/Makefile.arch index 3d338a03a..2bf2b7607 100644 --- a/libc/sysdeps/linux/i386/Makefile.arch +++ b/libc/sysdeps/linux/i386/Makefile.arch @@ -10,5 +10,3 @@ CSRC := brk.c sigaction.c __syscall_error.c SSRC := \ __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ sync_file_range.S syscall.S mmap.S mmap64.S posix_fadvise64.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/ia64/Makefile.arch b/libc/sysdeps/linux/ia64/Makefile.arch index 2b3212498..223f9ef7c 100644 --- a/libc/sysdeps/linux/ia64/Makefile.arch +++ b/libc/sysdeps/linux/ia64/Makefile.arch @@ -10,5 +10,3 @@ CSRC := __syscall_error.c SSRC := \ __longjmp.S brk.S bsd-setjmp.S bsd-_setjmp.S clone2.S fork.S \ pipe.S setjmp.S syscall.S vfork.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/m68k/Makefile.arch b/libc/sysdeps/linux/m68k/Makefile.arch index 14ce2e30a..b0f9be3fd 100644 --- a/libc/sysdeps/linux/m68k/Makefile.arch +++ b/libc/sysdeps/linux/m68k/Makefile.arch @@ -8,5 +8,3 @@ CSRC := brk.c __syscall_error.c syscall.c SSRC := __longjmp.S bsd-_setjmp.S bsd-setjmp.S clone.S setjmp.S vfork.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/mips/Makefile.arch b/libc/sysdeps/linux/mips/Makefile.arch index da5ca1e0f..ce80c7590 100644 --- a/libc/sysdeps/linux/mips/Makefile.arch +++ b/libc/sysdeps/linux/mips/Makefile.arch @@ -14,5 +14,3 @@ SSRC := bsd-_setjmp.S bsd-setjmp.S setjmp.S clone.S syscall.S pipe.S ARCH_HEADERS := sgidefs.h # regdef.h - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/nios/Makefile.arch b/libc/sysdeps/linux/nios/Makefile.arch index 9bcd0be7e..6a2c3235b 100644 --- a/libc/sysdeps/linux/nios/Makefile.arch +++ b/libc/sysdeps/linux/nios/Makefile.arch @@ -10,5 +10,3 @@ CSRC := brk.c crtbegin.c crtend.c SSRC := \ __longjmp.S bsd-_setjmp.S bsd-setjmp.S setjmp.S \ clone.S vfork.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/nios2/Makefile.arch b/libc/sysdeps/linux/nios2/Makefile.arch index fadde953e..a0c485aae 100644 --- a/libc/sysdeps/linux/nios2/Makefile.arch +++ b/libc/sysdeps/linux/nios2/Makefile.arch @@ -10,5 +10,3 @@ CSRC := brk.c syscall.c SSRC := \ __longjmp.S bsd-_setjmp.S bsd-setjmp.S setjmp.S \ vfork.S clone.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/powerpc/Makefile.arch b/libc/sysdeps/linux/powerpc/Makefile.arch index 85c2cd3c6..b476c4e21 100644 --- a/libc/sysdeps/linux/powerpc/Makefile.arch +++ b/libc/sysdeps/linux/powerpc/Makefile.arch @@ -14,5 +14,3 @@ SSRC := \ ifeq ($(CONFIG_E500),y) ARCH_HEADERS := fenv.h endif - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/sh/Makefile.arch b/libc/sysdeps/linux/sh/Makefile.arch index 6df516286..31beda111 100644 --- a/libc/sysdeps/linux/sh/Makefile.arch +++ b/libc/sysdeps/linux/sh/Makefile.arch @@ -10,5 +10,3 @@ CSRC := \ mmap.c pipe.c __init_brk.c brk.c sbrk.c pread_write.c cacheflush.c SSRC := setjmp.S __longjmp.S vfork.S clone.S ___fpscr_values.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/sh64/Makefile.arch b/libc/sysdeps/linux/sh64/Makefile.arch index d49540ebe..4e12532bc 100644 --- a/libc/sysdeps/linux/sh64/Makefile.arch +++ b/libc/sysdeps/linux/sh64/Makefile.arch @@ -8,5 +8,3 @@ CSRC := __init_brk.c brk.c sbrk.c syscall.c SSRC := setjmp.S __longjmp.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/sparc/Makefile.arch b/libc/sysdeps/linux/sparc/Makefile.arch index 9cf0a1afa..ffae27bc7 100644 --- a/libc/sysdeps/linux/sparc/Makefile.arch +++ b/libc/sysdeps/linux/sparc/Makefile.arch @@ -10,5 +10,3 @@ CSRC := brk.c __syscall_error.c qp_ops.c sigaction.c SSRC := \ __longjmp.S fork.S vfork.S clone.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ syscall.S urem.S udiv.S umul.S sdiv.S rem.S pipe.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/vax/Makefile.arch b/libc/sysdeps/linux/vax/Makefile.arch index ea8672c7d..027c65f90 100644 --- a/libc/sysdeps/linux/vax/Makefile.arch +++ b/libc/sysdeps/linux/vax/Makefile.arch @@ -8,5 +8,3 @@ CSRC := brk.c mmap.c SSRC := __longjmp.S setjmp.S _setjmp.S clone.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/x86_64/Makefile.arch b/libc/sysdeps/linux/x86_64/Makefile.arch index b6ad71cbd..044f97f95 100644 --- a/libc/sysdeps/linux/x86_64/Makefile.arch +++ b/libc/sysdeps/linux/x86_64/Makefile.arch @@ -9,5 +9,3 @@ CSRC := brk.c sigaction.c __syscall_error.c mmap.c SSRC := \ __longjmp.S vfork.S setjmp.S syscall.S bsd-setjmp.S bsd-_setjmp.S clone.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/xtensa/Makefile.arch b/libc/sysdeps/linux/xtensa/Makefile.arch index f54886444..3e2b1e108 100644 --- a/libc/sysdeps/linux/xtensa/Makefile.arch +++ b/libc/sysdeps/linux/xtensa/Makefile.arch @@ -10,5 +10,3 @@ CSRC := brk.c fork.c posix_fadvise.c posix_fadvise64.c pread_write.c \ SSRC := bsd-_setjmp.S bsd-setjmp.S setjmp.S clone.S \ sigrestorer.S syscall.S mmap.S windowspill.S __longjmp.S vfork.S - -include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch -- cgit v1.2.3