From 358043ffb9380926813eb8200f0a45140acdb77a Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Fri, 28 Oct 2005 09:57:22 +0000 Subject: Renamed arch specific Makefile.in to Makefile.arch, else if TARGET_ARCH does not exist, we reinclude the including Makefile. Moved arch/common fpu_control.h link creation into main Makefile.in. Updated the link creation script to remove all the other Makefiles --- libc/sysdeps/linux/Makefile.in | 2 +- libc/sysdeps/linux/arm/Makefile.arch | 32 ++++++++++++++++++++++ libc/sysdeps/linux/arm/Makefile.in | 38 -------------------------- libc/sysdeps/linux/common/Makefile.in | 6 ----- libc/sysdeps/linux/i386/Makefile.arch | 33 +++++++++++++++++++++++ libc/sysdeps/linux/i386/Makefile.in | 39 --------------------------- libc/sysdeps/linux/mips/Makefile.arch | 46 ++++++++++++++++++++++++++++++++ libc/sysdeps/linux/mips/Makefile.in | 42 ----------------------------- libc/sysdeps/linux/powerpc/Makefile.arch | 32 ++++++++++++++++++++++ libc/sysdeps/linux/powerpc/Makefile.in | 38 -------------------------- libc/sysdeps/linux/x86_64/Makefile.arch | 32 ++++++++++++++++++++++ libc/sysdeps/linux/x86_64/Makefile.in | 38 -------------------------- 12 files changed, 176 insertions(+), 202 deletions(-) create mode 100644 libc/sysdeps/linux/arm/Makefile.arch delete mode 100644 libc/sysdeps/linux/arm/Makefile.in create mode 100644 libc/sysdeps/linux/i386/Makefile.arch delete mode 100644 libc/sysdeps/linux/i386/Makefile.in create mode 100644 libc/sysdeps/linux/mips/Makefile.arch delete mode 100644 libc/sysdeps/linux/mips/Makefile.in create mode 100644 libc/sysdeps/linux/powerpc/Makefile.arch delete mode 100644 libc/sysdeps/linux/powerpc/Makefile.in create mode 100644 libc/sysdeps/linux/x86_64/Makefile.arch delete mode 100644 libc/sysdeps/linux/x86_64/Makefile.in (limited to 'libc/sysdeps/linux') diff --git a/libc/sysdeps/linux/Makefile.in b/libc/sysdeps/linux/Makefile.in index a8ae79edd..d2a980c16 100644 --- a/libc/sysdeps/linux/Makefile.in +++ b/libc/sysdeps/linux/Makefile.in @@ -6,5 +6,5 @@ # # order is relevant -include $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/Makefile.in +-include $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/Makefile.arch include $(top_srcdir)libc/sysdeps/linux/common/Makefile.in diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch new file mode 100644 index 000000000..e44b145f9 --- /dev/null +++ b/libc/sysdeps/linux/arm/Makefile.arch @@ -0,0 +1,32 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +CSRC:=brk.c syscall.c ioperm.c iopl.c sigaction.c __syscall_error.c +SSRC:= __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ + bsd-_setjmp.S sigrestorer.S mmap64.S + +ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/arm +ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/arm + +ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) +ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) +ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) +ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) + +ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) + +crt-y:=create +libc-a-y+=$(ARCH_OBJS) +libc-so-y+=$(ARCH_OBJS:.o=.os) + +#libc-multi-y+=$(ARCH_CSRC) +libc-nomulti-y+=$(ARCH_OBJS) + +objclean-y+=arch_objclean + +arch_objclean: + $(RM) $(ARCH_OUT)/*.{o,os} diff --git a/libc/sysdeps/linux/arm/Makefile.in b/libc/sysdeps/linux/arm/Makefile.in deleted file mode 100644 index 87339cd0d..000000000 --- a/libc/sysdeps/linux/arm/Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -CSRC:=brk.c syscall.c ioperm.c iopl.c sigaction.c __syscall_error.c -SSRC:= __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ - bsd-_setjmp.S sigrestorer.S mmap64.S - -ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/arm -ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/arm - -ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) -ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) -ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) -ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) - -ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) - -crt-y:=create -libc-a-y+=$(ARCH_OBJS) -libc-a-pic-y+=$(ARCH_OBJS:.o=.os) -libc-so-y+=$(ARCH_OBJS:.o=.os) - -#libc-multi-y+=$(ARCH_CSRC) -libc-nomulti-y+=$(ARCH_OBJS) - -objclean-y+=arch_objclean - -arch_objclean: - $(RM) $(ARCH_OUT)/*.{o,os} - -headers-y+=arch_headers - -arch_headers: - $(LN) -fs ../libc/sysdeps/linux/arm/fpu_control.h $(top_builddir)include/ diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index ce7d8f90d..2ddb9128a 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -43,9 +43,3 @@ objclean-y+=common_objclean common_objclean: $(RM) $(COMMON_OUT)/*.{o,os} - -headers-y+=common_headers - -common_headers: - $(LN) -fs ../libc/sysdeps/linux/common/fpu_control.h $(top_builddir)include/ - $(LN) -fs ../libc/sysdeps/linux/common/dl-osinfo.h $(top_builddir)include/ diff --git a/libc/sysdeps/linux/i386/Makefile.arch b/libc/sysdeps/linux/i386/Makefile.arch new file mode 100644 index 000000000..3ced8debd --- /dev/null +++ b/libc/sysdeps/linux/i386/Makefile.arch @@ -0,0 +1,33 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +CSRC:=brk.c sigaction.c __syscall_error.c + +SSRC:= __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ + bsd-_setjmp.S syscall.S mmap.S mmap64.S + +ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/i386 +ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/i386 + +ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) +ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) +ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) +ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) + +ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) + +crt-y:=create +libc-a-y+=$(ARCH_OBJS) +libc-so-y+=$(ARCH_OBJS:.o=.os) + +#libc-multi-y+=$(ARCH_CSRC) +libc-nomulti-y+=$(ARCH_OBJS) + +objclean-y+=arch_objclean + +arch_objclean: + $(RM) $(ARCH_OUT)/*.{o,os} diff --git a/libc/sysdeps/linux/i386/Makefile.in b/libc/sysdeps/linux/i386/Makefile.in deleted file mode 100644 index 9593b7405..000000000 --- a/libc/sysdeps/linux/i386/Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -CSRC:=brk.c sigaction.c __syscall_error.c - -SSRC:= __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ - bsd-_setjmp.S syscall.S mmap.S mmap64.S - -ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/i386 -ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/i386 - -ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) -ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) -ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) -ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) - -ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) - -crt-y:=create -libc-a-y+=$(ARCH_OBJS) -libc-a-pic-y+=$(ARCH_OBJS:.o=.os) -libc-so-y+=$(ARCH_OBJS:.o=.os) - -#libc-multi-y+=$(ARCH_CSRC) -libc-nomulti-y+=$(ARCH_OBJS) - -objclean-y+=arch_objclean - -arch_objclean: - $(RM) $(ARCH_OUT)/*.{o,os} - -headers-y+=arch_headers - -arch_headers: - $(LN) -fs ../libc/sysdeps/linux/i386/fpu_control.h $(top_builddir)include/ diff --git a/libc/sysdeps/linux/mips/Makefile.arch b/libc/sysdeps/linux/mips/Makefile.arch new file mode 100644 index 000000000..5878aa708 --- /dev/null +++ b/libc/sysdeps/linux/mips/Makefile.arch @@ -0,0 +1,46 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +CSRC:= __longjmp.c brk.c setjmp_aux.c mmap.c __syscall_error.c \ + cacheflush.c pread_write.c sysmips.c _test_and_set.c sigaction.c + +SSRC:=bsd-_setjmp.S bsd-setjmp.S setjmp.S clone.S syscall.S pipe.S + + +ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/mips +ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/mips + +ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) +ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) +ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) +ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) + +ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) + +crt-y:=create +libc-a-y+=$(ARCH_OBJS) +libc-so-y+=$(ARCH_OBJS:.o=.os) + +#libc-multi-y+=$(ARCH_CSRC) +libc-nomulti-y+=$(ARCH_OBJS) + +objclean-y+=arch_objclean + +arch_objclean: + $(RM) $(ARCH_OUT)/*.{o,os} + +headers_clean-y+=arch_headers_clean + +arch_headers_clean: + $(RM) $(top_builddir)include/sgidefs.h + #$(RM) $(top_builddir)include/regdef.h + +headers-y+=arch_headers + +arch_headers: + $(LN) -fs ../libc/sysdeps/linux/mips/sgidefs.h $(top_builddir)include/ +# $(LN) -fs ../libc/sysdeps/linux/mips/regdef.h $(top_builddir)include/ diff --git a/libc/sysdeps/linux/mips/Makefile.in b/libc/sysdeps/linux/mips/Makefile.in deleted file mode 100644 index e6075d7f6..000000000 --- a/libc/sysdeps/linux/mips/Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -CSRC:= __longjmp.c brk.c setjmp_aux.c mmap.c __syscall_error.c \ - cacheflush.c pread_write.c sysmips.c _test_and_set.c sigaction.c - -SSRC:=bsd-_setjmp.S bsd-setjmp.S setjmp.S clone.S syscall.S pipe.S - - -ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/mips -ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/mips - -ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) -ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) -ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) -ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) - -ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) - -crt-y:=create -libc-a-y+=$(ARCH_OBJS) -libc-a-pic-y+=$(ARCH_OBJS:.o=.os) -libc-so-y+=$(ARCH_OBJS:.o=.os) - -#libc-multi-y+=$(ARCH_CSRC) -libc-nomulti-y+=$(ARCH_OBJS) - -objclean-y+=arch_objclean - -arch_objclean: - $(RM) $(ARCH_OUT)/*.{o,os} $(top_builddir)include/sgidefs.h - -headers-y+=arch_headers - -arch_headers: - $(LN) -fs ../libc/sysdeps/linux/mips/sgidefs.h $(top_builddir)include/ -# $(LN) -fs ../libc/sysdeps/linux/mips/regdef.h $(top_builddir)include/ - $(LN) -fs ../libc/sysdeps/linux/mips/fpu_control.h $(top_builddir)include/ diff --git a/libc/sysdeps/linux/powerpc/Makefile.arch b/libc/sysdeps/linux/powerpc/Makefile.arch new file mode 100644 index 000000000..f0c5d9f02 --- /dev/null +++ b/libc/sysdeps/linux/powerpc/Makefile.arch @@ -0,0 +1,32 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +CSRC:=mmap.c __syscall_error.c pread_write.c ioctl.c +SSRC:= __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \ + clone.S __uClibc_syscall.S syscall.S vfork.S + +ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/powerpc +ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/powerpc + +ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) +ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) +ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) +ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) + +ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) + +crt-y:=create +libc-a-y+=$(ARCH_OBJS) +libc-so-y+=$(ARCH_OBJS:.o=.os) + +#libc-multi-y+=$(ARCH_CSRC) +libc-nomulti-y+=$(ARCH_OBJS) + +objclean-y+=arch_objclean + +arch_objclean: + $(RM) $(ARCH_OUT)/*.{o,os} diff --git a/libc/sysdeps/linux/powerpc/Makefile.in b/libc/sysdeps/linux/powerpc/Makefile.in deleted file mode 100644 index 3cc5ca539..000000000 --- a/libc/sysdeps/linux/powerpc/Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -CSRC:=mmap.c __syscall_error.c pread_write.c ioctl.c -SSRC:= __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \ - clone.S __uClibc_syscall.S syscall.S vfork.S - -ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/powerpc -ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/powerpc - -ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) -ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) -ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) -ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) - -ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) - -crt-y:=create -libc-a-y+=$(ARCH_OBJS) -libc-a-pic-y+=$(ARCH_OBJS:.o=.os) -libc-so-y+=$(ARCH_OBJS:.o=.os) - -#libc-multi-y+=$(ARCH_CSRC) -libc-nomulti-y+=$(ARCH_OBJS) - -objclean-y+=arch_objclean - -arch_objclean: - $(RM) $(ARCH_OUT)/*.{o,os} - -headers-y+=arch_headers - -arch_headers: - $(LN) -fs ../libc/sysdeps/linux/powerpc/fpu_control.h $(top_builddir)include/ diff --git a/libc/sysdeps/linux/x86_64/Makefile.arch b/libc/sysdeps/linux/x86_64/Makefile.arch new file mode 100644 index 000000000..6752c275d --- /dev/null +++ b/libc/sysdeps/linux/x86_64/Makefile.arch @@ -0,0 +1,32 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +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 + +ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/x86_64 +ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/x86_64 + +ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) +ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) +ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) +ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) + +ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) + +crt-y:=create +libc-a-y+=$(ARCH_OBJS) +libc-so-y+=$(ARCH_OBJS:.o=.os) + +#libc-multi-y+=$(ARCH_CSRC) +libc-nomulti-y+=$(ARCH_OBJS) + +objclean-y+=arch_objclean + +arch_objclean: + $(RM) $(ARCH_OUT)/*.{o,os} diff --git a/libc/sysdeps/linux/x86_64/Makefile.in b/libc/sysdeps/linux/x86_64/Makefile.in deleted file mode 100644 index a167993a2..000000000 --- a/libc/sysdeps/linux/x86_64/Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -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 - -ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/x86_64 -ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/x86_64 - -ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) -ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) -ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) -ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) - -ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) - -crt-y:=create -libc-a-y+=$(ARCH_OBJS) -libc-a-pic-y+=$(ARCH_OBJS:.o=.os) -libc-so-y+=$(ARCH_OBJS:.o=.os) - -#libc-multi-y+=$(ARCH_CSRC) -libc-nomulti-y+=$(ARCH_OBJS) - -objclean-y+=arch_objclean - -arch_objclean: - $(RM) $(ARCH_OUT)/*.{o,os} - -headers-y+=arch_headers - -arch_headers: - $(LN) -fs ../libc/sysdeps/linux/x86_64/fpu_control.h $(top_builddir)include/ -- cgit v1.2.3