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 --- Makefile.in | 12 ++++-- extra/scripts/create_links.sh | 7 ++-- libc/string/Makefile.in | 2 +- libc/string/arm/Makefile.arch | 27 +++++++++++++ libc/string/arm/Makefile.in | 28 ------------- libc/string/frv/Makefile.arch | 27 +++++++++++++ libc/string/frv/Makefile.in | 28 ------------- libc/string/generic/Makefile.in | 1 - libc/string/i386/Makefile.arch | 35 ++++++++++++++++ libc/string/i386/Makefile.in | 36 ----------------- libc/string/mips/Makefile.arch | 26 ++++++++++++ libc/string/mips/Makefile.in | 27 ------------- libc/string/powerpc/Makefile.arch | 33 ++++++++++++++++ libc/string/powerpc/Makefile.in | 34 ---------------- libc/string/sh64/Makefile.arch | 27 +++++++++++++ libc/string/sh64/Makefile.in | 28 ------------- libc/string/sparc/Makefile.arch | 27 +++++++++++++ libc/string/sparc/Makefile.in | 28 ------------- libc/string/x86_64/Makefile.arch | 27 +++++++++++++ libc/string/x86_64/Makefile.in | 28 ------------- 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 ------------------ libm/Makefile.in | 2 +- libm/powerpc/Makefile.arch | 24 +++++++++++ libm/powerpc/Makefile.in | 24 ----------- libpthread/linuxthreads/Makefile.in | 2 +- libpthread/linuxthreads/sysdeps/sh64/Makefile.arch | 26 ++++++++++++ libpthread/linuxthreads/sysdeps/sh64/Makefile.in | 26 ------------ 38 files changed, 471 insertions(+), 499 deletions(-) create mode 100644 libc/string/arm/Makefile.arch delete mode 100644 libc/string/arm/Makefile.in create mode 100644 libc/string/frv/Makefile.arch delete mode 100644 libc/string/frv/Makefile.in create mode 100644 libc/string/i386/Makefile.arch delete mode 100644 libc/string/i386/Makefile.in create mode 100644 libc/string/mips/Makefile.arch delete mode 100644 libc/string/mips/Makefile.in create mode 100644 libc/string/powerpc/Makefile.arch delete mode 100644 libc/string/powerpc/Makefile.in create mode 100644 libc/string/sh64/Makefile.arch delete mode 100644 libc/string/sh64/Makefile.in create mode 100644 libc/string/sparc/Makefile.arch delete mode 100644 libc/string/sparc/Makefile.in create mode 100644 libc/string/x86_64/Makefile.arch delete mode 100644 libc/string/x86_64/Makefile.in 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 create mode 100644 libm/powerpc/Makefile.arch delete mode 100644 libm/powerpc/Makefile.in create mode 100644 libpthread/linuxthreads/sysdeps/sh64/Makefile.arch delete mode 100644 libpthread/linuxthreads/sysdeps/sh64/Makefile.in diff --git a/Makefile.in b/Makefile.in index 8d8065696..4aa2a78f3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -71,6 +71,12 @@ headers: $(top_srcdir)include/bits/uClibc_config.h $(top_srcdir)extra/scripts/fix_includes.sh \ -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) \ $(header_extra_args) + if [ -f libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h ] ; then \ + $(LN) -fs ../libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h include/ ; \ + else \ + $(LN) -fs ../libc/sysdeps/linux/common/fpu_control.h include/ ; \ + fi + $(LN) -fs ../libc/sysdeps/linux/common/dl-osinfo.h include/ @cd $(top_builddir)include/bits; \ set -e; \ for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \ @@ -366,7 +372,7 @@ clean: $(MAKE) -C test clean $(MAKE) -C utils clean @set -e; \ - for i in `(cd $(top_builddir)libc/sysdeps/linux/common/sys; ls *.h)` ; do \ + for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \ $(RM) include/sys/$$i; \ done; \ if [ -d libc/sysdeps/linux/$(TARGET_ARCH)/sys ] ; then \ @@ -375,8 +381,8 @@ clean: done; \ fi @$(RM) include/linux include/asm* - @if [ -d libc/sysdeps/linux/$(TARGET_ARCH) ]; then \ - $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) clean; \ + @if [ -f libc/sysdeps/linux/$(TARGET_ARCH)/Makefile.arch ]; then \ + $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers_clean-y; \ fi -find . \( -name \*.o -o -name \*.os -o -name \*.oS \) -exec $(RM) {} \; diff --git a/extra/scripts/create_links.sh b/extra/scripts/create_links.sh index 86a0867dc..58bb84852 100755 --- a/extra/scripts/create_links.sh +++ b/extra/scripts/create_links.sh @@ -7,18 +7,19 @@ DIRS2="ldso/ldso ldso/libdl libpthread/linuxthreads libpthread/linuxthreads_db" OBJ4="common arm i386 mips powerpc x86_64" for x in ${DIRS} ; do - rm -f ${x}/Makefile + find ${x} -type f -name Makefile -exec rm -f {} \; ln -sf ../extra/scripts/Makefile.libs.lvl1 ${x}/Makefile done for x in ${DIRS2} ; do - rm -f ${x}/Makefile ln -sf ../../extra/scripts/Makefile.libs.lvl2 ${x}/Makefile done for x in ${OBJ4} ; do - rm -f libc/sysdeps/linux/${x}/Makefile ln -sf ../../../../extra/scripts/Makefile.objs.lvl4 libc/sysdeps/linux/${x}/Makefile done +rm -f Makefile +ln -sf Makefile.in Makefile + exit 0 diff --git a/libc/string/Makefile.in b/libc/string/Makefile.in index 16acafbe1..820baec1c 100644 --- a/libc/string/Makefile.in +++ b/libc/string/Makefile.in @@ -6,7 +6,7 @@ # # order is relevant --include $(top_srcdir)libc/string/$(TARGET_ARCH)/Makefile.in +-include $(top_srcdir)libc/string/$(TARGET_ARCH)/Makefile.arch include $(top_srcdir)libc/string/generic/Makefile.in MSRC:=wstring.c diff --git a/libc/string/arm/Makefile.arch b/libc/string/arm/Makefile.arch new file mode 100644 index 000000000..f4069d9d1 --- /dev/null +++ b/libc/string/arm/Makefile.arch @@ -0,0 +1,27 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +SSRC:= _memcpy.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \ + strcmp.S strlen.S strncmp.S + +STRING_ARCH_DIR:=$(top_srcdir)libc/string/arm +STRING_ARCH_OUT:=$(top_builddir)libc/string/arm + +STRING_ARCH_SRC:=$(patsubst %.S,$(STRING_ARCH_DIR)/%.S,$(SSRC)) +STRING_ARCH_OBJ:=$(patsubst %.S,$(STRING_ARCH_OUT)/%.o,$(SSRC)) + +STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) + +libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) +libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) + +libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) + +objclean-y+=string_arch_objclean + +string_arch_objclean: + $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/arm/Makefile.in b/libc/string/arm/Makefile.in deleted file mode 100644 index 0f9502d14..000000000 --- a/libc/string/arm/Makefile.in +++ /dev/null @@ -1,28 +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. -# - -SSRC:= _memcpy.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \ - strcmp.S strlen.S strncmp.S - -STRING_ARCH_DIR:=$(top_srcdir)libc/string/arm -STRING_ARCH_OUT:=$(top_builddir)libc/string/arm - -STRING_ARCH_SRC:=$(patsubst %.S,$(STRING_ARCH_DIR)/%.S,$(SSRC)) -STRING_ARCH_OBJ:=$(patsubst %.S,$(STRING_ARCH_OUT)/%.o,$(SSRC)) - -STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) - -libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) -libc-a-pic-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) - -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) - -objclean-y+=string_arch_objclean - -string_arch_objclean: - $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/frv/Makefile.arch b/libc/string/frv/Makefile.arch new file mode 100644 index 000000000..5b5230088 --- /dev/null +++ b/libc/string/frv/Makefile.arch @@ -0,0 +1,27 @@ +# Makefile for uClibc +# +# Copyright (C) 2004 Alexandre Oliva +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +SSRC:=memcpy.S memset.S + +STRING_ARCH_DIR:=$(top_srcdir)libc/string/frv +STRING_ARCH_OUT:=$(top_builddir)libc/string/frv + +STRING_ARCH_SRC:=$(patsubst %.S,$(STRING_ARCH_DIR)/%.S,$(SSRC)) +STRING_ARCH_OBJ:=$(patsubst %.S,$(STRING_ARCH_OUT)/%.o,$(SSRC)) + +STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) + +libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) +libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) + +libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) + +objclean-y+=string_arch_objclean + +string_arch_objclean: + $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/frv/Makefile.in b/libc/string/frv/Makefile.in deleted file mode 100644 index 649998325..000000000 --- a/libc/string/frv/Makefile.in +++ /dev/null @@ -1,28 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2004 Alexandre Oliva -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -SSRC:=memcpy.S memset.S - -STRING_ARCH_DIR:=$(top_srcdir)libc/string/frv -STRING_ARCH_OUT:=$(top_builddir)libc/string/frv - -STRING_ARCH_SRC:=$(patsubst %.S,$(STRING_ARCH_DIR)/%.S,$(SSRC)) -STRING_ARCH_OBJ:=$(patsubst %.S,$(STRING_ARCH_OUT)/%.o,$(SSRC)) - -STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) - -libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) -libc-a-pic-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) - -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) - -objclean-y+=string_arch_objclean - -string_arch_objclean: - $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/generic/Makefile.in b/libc/string/generic/Makefile.in index aef1ac882..2273181d5 100644 --- a/libc/string/generic/Makefile.in +++ b/libc/string/generic/Makefile.in @@ -22,7 +22,6 @@ STRING_GENERIC_OBJ:=$(patsubst %.o,$(STRING_GENERIC_OUT)/%.o,$(MOBJ)) STRING_GENERIC_OBJS:=$(STRING_GENERIC_OBJ) libc-a-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS) -libc-a-pic-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS:.o=.os) libc-so-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS:.o=.os) #libc-multi-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_SRC) diff --git a/libc/string/i386/Makefile.arch b/libc/string/i386/Makefile.arch new file mode 100644 index 000000000..65f461cbb --- /dev/null +++ b/libc/string/i386/Makefile.arch @@ -0,0 +1,35 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +MSRC:=string.c +MOBJ:= strcpy.o strncpy.o strcat.o strncat.o strcmp.o \ + strncmp.o strchr.o strrchr.o strlen.o strnlen.o \ + memcpy.o memmove.o memchr.o memset.o + +STRING_ARCH_DIR:=$(top_srcdir)libc/string/i386 +STRING_ARCH_OUT:=$(top_builddir)libc/string/i386 + +STRING_ARCH_MSRC:=$(patsubst %.c,$(STRING_ARCH_DIR)/%.c,$(MSRC)) +STRING_ARCH_MOBJ:=$(patsubst %.o,$(STRING_ARCH_OUT)/%.o,$(MOBJ)) + +STRING_ARCH_OBJS:=$(STRING_ARCH_MOBJ) + +STRING_ARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_ARCH_OBJS)))) + +$(STRING_ARCH_MOBJ) $(STRING_ARCH_MOBJ:.o=.os): $(STRING_ARCH_MSRC) + $(compile.m) + +libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) +libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) + +CFLAGS-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_DEF) +libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_MSRC) + +objclean-y+=string_arch_objclean + +string_arch_objclean: + $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/i386/Makefile.in b/libc/string/i386/Makefile.in deleted file mode 100644 index 2935c8355..000000000 --- a/libc/string/i386/Makefile.in +++ /dev/null @@ -1,36 +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. -# - -MSRC:=string.c -MOBJ:= strcpy.o strncpy.o strcat.o strncat.o strcmp.o \ - strncmp.o strchr.o strrchr.o strlen.o strnlen.o \ - memcpy.o memmove.o memchr.o memset.o - -STRING_ARCH_DIR:=$(top_srcdir)libc/string/i386 -STRING_ARCH_OUT:=$(top_builddir)libc/string/i386 - -STRING_ARCH_MSRC:=$(patsubst %.c,$(STRING_ARCH_DIR)/%.c,$(MSRC)) -STRING_ARCH_MOBJ:=$(patsubst %.o,$(STRING_ARCH_OUT)/%.o,$(MOBJ)) - -STRING_ARCH_OBJS:=$(STRING_ARCH_MOBJ) - -STRING_ARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_ARCH_OBJS)))) - -$(STRING_ARCH_MOBJ) $(STRING_ARCH_MOBJ:.o=.os): $(STRING_ARCH_MSRC) - $(compile.m) - -libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) -libc-a-pic-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) - -CFLAGS-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_DEF) -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_MSRC) - -objclean-y+=string_arch_objclean - -string_arch_objclean: - $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/mips/Makefile.arch b/libc/string/mips/Makefile.arch new file mode 100644 index 000000000..8aebbe27b --- /dev/null +++ b/libc/string/mips/Makefile.arch @@ -0,0 +1,26 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +SSRC:=memcpy.S memset.S + +STRING_ARCH_DIR:=$(top_srcdir)libc/string/mips +STRING_ARCH_OUT:=$(top_builddir)libc/string/mips + +STRING_ARCH_SRC:=$(patsubst %.S,$(STRING_ARCH_DIR)/%.S,$(SSRC)) +STRING_ARCH_OBJ:=$(patsubst %.S,$(STRING_ARCH_OUT)/%.o,$(SSRC)) + +STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) + +libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) +libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) + +libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) + +objclean-y+=string_arch_objclean + +string_arch_objclean: + $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/mips/Makefile.in b/libc/string/mips/Makefile.in deleted file mode 100644 index 2ba596b95..000000000 --- a/libc/string/mips/Makefile.in +++ /dev/null @@ -1,27 +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. -# - -SSRC:=memcpy.S memset.S - -STRING_ARCH_DIR:=$(top_srcdir)libc/string/mips -STRING_ARCH_OUT:=$(top_builddir)libc/string/mips - -STRING_ARCH_SRC:=$(patsubst %.S,$(STRING_ARCH_DIR)/%.S,$(SSRC)) -STRING_ARCH_OBJ:=$(patsubst %.S,$(STRING_ARCH_OUT)/%.o,$(SSRC)) - -STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) - -libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) -libc-a-pic-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) - -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) - -objclean-y+=string_arch_objclean - -string_arch_objclean: - $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/powerpc/Makefile.arch b/libc/string/powerpc/Makefile.arch new file mode 100644 index 000000000..97ae14e7f --- /dev/null +++ b/libc/string/powerpc/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. +# + +MSRC:=string.c +MOBJ:=memcpy.o memmove.o memset.o bzero.o + +STRING_ARCH_DIR:=$(top_srcdir)libc/string/powerpc +STRING_ARCH_OUT:=$(top_builddir)libc/string/powerpc + +STRING_ARCH_MSRC:=$(patsubst %.c,$(STRING_ARCH_DIR)/%.c,$(MSRC)) +STRING_ARCH_MOBJ:=$(patsubst %.o,$(STRING_ARCH_OUT)/%.o,$(MOBJ)) + +STRING_ARCH_OBJS:=$(STRING_ARCH_MOBJ) + +STRING_ARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_ARCH_MOBJ)))) + +$(STRING_ARCH_MOBJ) $(STRING_ARCH_MOBJ:.o=.os): $(STRING_ARCH_MSRC) + $(compile.m) + +libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) +libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) + +CFLAGS-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_DEF) +libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_MSRC) + +objclean-y+=string_arch_objclean + +string_arch_objclean: + $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/powerpc/Makefile.in b/libc/string/powerpc/Makefile.in deleted file mode 100644 index d22312fe0..000000000 --- a/libc/string/powerpc/Makefile.in +++ /dev/null @@ -1,34 +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. -# - -MSRC:=string.c -MOBJ:=memcpy.o memmove.o memset.o bzero.o - -STRING_ARCH_DIR:=$(top_srcdir)libc/string/powerpc -STRING_ARCH_OUT:=$(top_builddir)libc/string/powerpc - -STRING_ARCH_MSRC:=$(patsubst %.c,$(STRING_ARCH_DIR)/%.c,$(MSRC)) -STRING_ARCH_MOBJ:=$(patsubst %.o,$(STRING_ARCH_OUT)/%.o,$(MOBJ)) - -STRING_ARCH_OBJS:=$(STRING_ARCH_MOBJ) - -STRING_ARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_ARCH_MOBJ)))) - -$(STRING_ARCH_MOBJ) $(STRING_ARCH_MOBJ:.o=.os): $(STRING_ARCH_MSRC) - $(compile.m) - -libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) -libc-a-pic-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) - -CFLAGS-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_DEF) -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_MSRC) - -objclean-y+=string_arch_objclean - -string_arch_objclean: - $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/sh64/Makefile.arch b/libc/string/sh64/Makefile.arch new file mode 100644 index 000000000..b691ae1d7 --- /dev/null +++ b/libc/string/sh64/Makefile.arch @@ -0,0 +1,27 @@ +# Makefile for uClibc +# +# Copyright (C) 2003 Paul Mundt +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +SSRC:=memcpy.S memset.S strcpy.S strlen.S + +STRING_ARCH_DIR:=$(top_srcdir)libc/string/sh64 +STRING_ARCH_OUT:=$(top_builddir)libc/string/sh64 + +STRING_ARCH_SRC:=$(patsubst %.S,$(STRING_ARCH_DIR)/%.S,$(SSRC)) +STRING_ARCH_OBJ:=$(patsubst %.S,$(STRING_ARCH_OUT)/%.o,$(SSRC)) + +STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) + +libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) +libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) + +libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) + +objclean-y+=string_arch_objclean + +string_arch_objclean: + $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/sh64/Makefile.in b/libc/string/sh64/Makefile.in deleted file mode 100644 index 1b728958a..000000000 --- a/libc/string/sh64/Makefile.in +++ /dev/null @@ -1,28 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2003 Paul Mundt -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -SSRC:=memcpy.S memset.S strcpy.S strlen.S - -STRING_ARCH_DIR:=$(top_srcdir)libc/string/sh64 -STRING_ARCH_OUT:=$(top_builddir)libc/string/sh64 - -STRING_ARCH_SRC:=$(patsubst %.S,$(STRING_ARCH_DIR)/%.S,$(SSRC)) -STRING_ARCH_OBJ:=$(patsubst %.S,$(STRING_ARCH_OUT)/%.o,$(SSRC)) - -STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) - -libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) -libc-a-pic-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) - -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) - -objclean-y+=string_arch_objclean - -string_arch_objclean: - $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/sparc/Makefile.arch b/libc/string/sparc/Makefile.arch new file mode 100644 index 000000000..726140c1b --- /dev/null +++ b/libc/string/sparc/Makefile.arch @@ -0,0 +1,27 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +STRING_ARCH_DIR:=$(top_srcdir)libc/string/sparc +STRING_ARCH_OUT:=$(top_builddir)libc/string/sparc + +STRING_ARCH_SRC:=$(wildcard $(STRING_ARCH_DIR)/*.c) +STRING_ARCH_OBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SRC)) + +STRING_ARCH_SSRC:=$(wildcard $(STRING_ARCH_DIR)/*.S) +STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SSRC)) + +STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) $(STRING_ARCH_SOBJ) + +libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) +libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) + +libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) $(STRING_ARCH_SSRC) + +objclean-y+=string_arch_objclean + +string_arch_objclean: + $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/sparc/Makefile.in b/libc/string/sparc/Makefile.in deleted file mode 100644 index 563271518..000000000 --- a/libc/string/sparc/Makefile.in +++ /dev/null @@ -1,28 +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. -# - -STRING_ARCH_DIR:=$(top_srcdir)libc/string/sparc -STRING_ARCH_OUT:=$(top_builddir)libc/string/sparc - -STRING_ARCH_SRC:=$(wildcard $(STRING_ARCH_DIR)/*.c) -STRING_ARCH_OBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SRC)) - -STRING_ARCH_SSRC:=$(wildcard $(STRING_ARCH_DIR)/*.S) -STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SSRC)) - -STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) $(STRING_ARCH_SOBJ) - -libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) -libc-a-pic-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) - -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) $(STRING_ARCH_SSRC) - -objclean-y+=string_arch_objclean - -string_arch_objclean: - $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/x86_64/Makefile.arch b/libc/string/x86_64/Makefile.arch new file mode 100644 index 000000000..914eab55c --- /dev/null +++ b/libc/string/x86_64/Makefile.arch @@ -0,0 +1,27 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +STRING_ARCH_DIR:=$(top_srcdir)libc/string/x86_64 +STRING_ARCH_OUT:=$(top_builddir)libc/string/x86_64 + +STRING_ARCH_SRC:=$(wildcard $(STRING_ARCH_DIR)/*.c) +STRING_ARCH_OBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SRC)) + +STRING_ARCH_SSRC:=$(wildcard $(STRING_ARCH_DIR)/*.S) +STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SSRC)) + +STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) $(STRING_ARCH_SOBJ) + +libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) +libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) + +libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) $(STRING_ARCH_SSRC) + +objclean-y+=string_x86_64_objclean + +string_x86_64_objclean: + $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/x86_64/Makefile.in b/libc/string/x86_64/Makefile.in deleted file mode 100644 index 83cc470c9..000000000 --- a/libc/string/x86_64/Makefile.in +++ /dev/null @@ -1,28 +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. -# - -STRING_ARCH_DIR:=$(top_srcdir)libc/string/x86_64 -STRING_ARCH_OUT:=$(top_builddir)libc/string/x86_64 - -STRING_ARCH_SRC:=$(wildcard $(STRING_ARCH_DIR)/*.c) -STRING_ARCH_OBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SRC)) - -STRING_ARCH_SSRC:=$(wildcard $(STRING_ARCH_DIR)/*.S) -STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SSRC)) - -STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) $(STRING_ARCH_SOBJ) - -libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) -libc-a-pic-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) - -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) $(STRING_ARCH_SSRC) - -objclean-y+=string_x86_64_objclean - -string_x86_64_objclean: - $(RM) $(STRING_ARCH_OUT)/*.{o,os} 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/ diff --git a/libm/Makefile.in b/libm/Makefile.in index b54b27f73..fb547465c 100644 --- a/libm/Makefile.in +++ b/libm/Makefile.in @@ -29,7 +29,7 @@ CFLAGS-s_lib_version.c=-D_POSIX_MODE LIB_NAME:=libm ifeq ($(HAS_FPU),y) --include $(top_srcdir)libm/$(TARGET_ARCH)/Makefile.in +-include $(top_srcdir)libm/$(TARGET_ARCH)/Makefile.arch endif FL_MSRC:=float_wrappers.c diff --git a/libm/powerpc/Makefile.arch b/libm/powerpc/Makefile.arch new file mode 100644 index 000000000..c6d39676a --- /dev/null +++ b/libm/powerpc/Makefile.arch @@ -0,0 +1,24 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +libm_ARCH_DIR:=$(top_srcdir)libm/powerpc +libm_ARCH_OUT:=$(top_builddir)libm/powerpc + +libm_ARCH_SRC:=$(wildcard $(libm_ARCH_DIR)/*.c) +libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_DIR)/%.c,$(libm_ARCH_OUT)/%.o,$(libm_ARCH_SRC)) + +libm_ARCH_OBJS:=$(libm_ARCH_OBJ) + +libm-a-$(DO_C99_MATH)+=$(libm_ARCH_OBJS) +libm-so-$(DO_C99_MATH)+=$(libm_ARCH_OBJS:.o=.os) + +libm-multi-$(DO_C99_MATH)+=$(libm_ARCH_SRC) + +objclean-y+=libm_arch_objclean + +libm_arch_objclean: + $(RM) $(libm_ARCH_OUT)/*.{o,os} diff --git a/libm/powerpc/Makefile.in b/libm/powerpc/Makefile.in deleted file mode 100644 index c6d39676a..000000000 --- a/libm/powerpc/Makefile.in +++ /dev/null @@ -1,24 +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. -# - -libm_ARCH_DIR:=$(top_srcdir)libm/powerpc -libm_ARCH_OUT:=$(top_builddir)libm/powerpc - -libm_ARCH_SRC:=$(wildcard $(libm_ARCH_DIR)/*.c) -libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_DIR)/%.c,$(libm_ARCH_OUT)/%.o,$(libm_ARCH_SRC)) - -libm_ARCH_OBJS:=$(libm_ARCH_OBJ) - -libm-a-$(DO_C99_MATH)+=$(libm_ARCH_OBJS) -libm-so-$(DO_C99_MATH)+=$(libm_ARCH_OBJS:.o=.os) - -libm-multi-$(DO_C99_MATH)+=$(libm_ARCH_SRC) - -objclean-y+=libm_arch_objclean - -libm_arch_objclean: - $(RM) $(libm_ARCH_OUT)/*.{o,os} diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index b6351725f..88692489f 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -30,7 +30,7 @@ libpthread_DIR:=$(top_srcdir)libpthread/linuxthreads libpthread_OUT:=$(top_builddir)libpthread/linuxthreads ARCH_CFLAGS:=$(CFLAGS) --include $(libpthread_DIR)/sysdeps/$(TARGET_ARCH)/Makefile.in +-include $(libpthread_DIR)/sysdeps/$(TARGET_ARCH)/Makefile.arch CFLAGS:=$(ARCH_CFLAGS) libpthread_SRC:=$(wildcard $(libpthread_DIR)/*.c) diff --git a/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch b/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch new file mode 100644 index 000000000..38cd12db6 --- /dev/null +++ b/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch @@ -0,0 +1,26 @@ +# Makefile for uClibc +# +# Copyright (C) 2003 Paul Mundt +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +# We need to build as SHcompact for tas.. +ARCH_CFLAGS:=$(subst 32media,compact,$(ARCH_CFLAGS)) + +libpthread_ARCH_DIR:=$(top_srcdir)libpthread/linuxthreads/sysdeps/sh64 +libpthread_ARCH_OUT:=$(top_builddir)libpthread/linuxthreads/sysdeps/sh64 + +libpthread_ARCH_SRC:=$(wildcard $(libpthread_ARCH_DIR)/*.c) +libpthread_ARCH_OBJ:=$(patsubst $(libpthread_ARCH_DIR)/%.c,$(libpthread_ARCH_OUT)/%.o,$(libpthread_ARCH_SRC)) + +libpthread-a-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_OBJ) +libpthread-so-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_OBJ:.o=.os) + +libpthread-multi-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_SRC) + +objclean-y+=libpthread_arch_objclean + +libpthread_arch_objclean: + $(RM) $(libpthread_ARCH_OUT)/*.{o,os} diff --git a/libpthread/linuxthreads/sysdeps/sh64/Makefile.in b/libpthread/linuxthreads/sysdeps/sh64/Makefile.in deleted file mode 100644 index 38cd12db6..000000000 --- a/libpthread/linuxthreads/sysdeps/sh64/Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2003 Paul Mundt -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -# We need to build as SHcompact for tas.. -ARCH_CFLAGS:=$(subst 32media,compact,$(ARCH_CFLAGS)) - -libpthread_ARCH_DIR:=$(top_srcdir)libpthread/linuxthreads/sysdeps/sh64 -libpthread_ARCH_OUT:=$(top_builddir)libpthread/linuxthreads/sysdeps/sh64 - -libpthread_ARCH_SRC:=$(wildcard $(libpthread_ARCH_DIR)/*.c) -libpthread_ARCH_OBJ:=$(patsubst $(libpthread_ARCH_DIR)/%.c,$(libpthread_ARCH_OUT)/%.o,$(libpthread_ARCH_SRC)) - -libpthread-a-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_OBJ) -libpthread-so-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_OBJ:.o=.os) - -libpthread-multi-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_SRC) - -objclean-y+=libpthread_arch_objclean - -libpthread_arch_objclean: - $(RM) $(libpthread_ARCH_OUT)/*.{o,os} -- cgit v1.2.3