summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-10-28 09:57:22 (GMT)
committerPeter S. Mazinger <ps.m@gmx.net>2005-10-28 09:57:22 (GMT)
commit358043ffb9380926813eb8200f0a45140acdb77a (patch)
treea2ff6acbb0f25269b47efd0679a212d82808298b /libc
parent86553e6605853bb982cd0cd578134c42e26ee407 (diff)
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
Diffstat (limited to 'libc')
-rw-r--r--libc/string/Makefile.in2
-rw-r--r--libc/string/arm/Makefile.arch (renamed from libc/string/arm/Makefile.in)1
-rw-r--r--libc/string/frv/Makefile.arch (renamed from libc/string/frv/Makefile.in)1
-rw-r--r--libc/string/generic/Makefile.in1
-rw-r--r--libc/string/i386/Makefile.arch (renamed from libc/string/i386/Makefile.in)1
-rw-r--r--libc/string/mips/Makefile.arch (renamed from libc/string/mips/Makefile.in)1
-rw-r--r--libc/string/powerpc/Makefile.arch (renamed from libc/string/powerpc/Makefile.in)1
-rw-r--r--libc/string/sh64/Makefile.arch (renamed from libc/string/sh64/Makefile.in)1
-rw-r--r--libc/string/sparc/Makefile.arch (renamed from libc/string/sparc/Makefile.in)1
-rw-r--r--libc/string/x86_64/Makefile.arch (renamed from libc/string/x86_64/Makefile.in)1
-rw-r--r--libc/sysdeps/linux/Makefile.in2
-rw-r--r--libc/sysdeps/linux/arm/Makefile.arch (renamed from libc/sysdeps/linux/arm/Makefile.in)6
-rw-r--r--libc/sysdeps/linux/common/Makefile.in6
-rw-r--r--libc/sysdeps/linux/i386/Makefile.arch (renamed from libc/sysdeps/linux/i386/Makefile.in)6
-rw-r--r--libc/sysdeps/linux/mips/Makefile.arch (renamed from libc/sysdeps/linux/mips/Makefile.in)10
-rw-r--r--libc/sysdeps/linux/powerpc/Makefile.arch (renamed from libc/sysdeps/linux/powerpc/Makefile.in)6
-rw-r--r--libc/sysdeps/linux/x86_64/Makefile.arch (renamed from libc/sysdeps/linux/x86_64/Makefile.in)6
17 files changed, 9 insertions, 44 deletions
diff --git a/libc/string/Makefile.in b/libc/string/Makefile.in
index 16acafb..820baec 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.in b/libc/string/arm/Makefile.arch
index 0f9502d..f4069d9 100644
--- a/libc/string/arm/Makefile.in
+++ b/libc/string/arm/Makefile.arch
@@ -17,7 +17,6 @@ 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)
diff --git a/libc/string/frv/Makefile.in b/libc/string/frv/Makefile.arch
index 6499983..5b52300 100644
--- a/libc/string/frv/Makefile.in
+++ b/libc/string/frv/Makefile.arch
@@ -17,7 +17,6 @@ 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)
diff --git a/libc/string/generic/Makefile.in b/libc/string/generic/Makefile.in
index aef1ac8..2273181 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.in b/libc/string/i386/Makefile.arch
index 2935c83..65f461c 100644
--- a/libc/string/i386/Makefile.in
+++ b/libc/string/i386/Makefile.arch
@@ -24,7 +24,6 @@ $(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)
diff --git a/libc/string/mips/Makefile.in b/libc/string/mips/Makefile.arch
index 2ba596b..8aebbe2 100644
--- a/libc/string/mips/Makefile.in
+++ b/libc/string/mips/Makefile.arch
@@ -16,7 +16,6 @@ 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)
diff --git a/libc/string/powerpc/Makefile.in b/libc/string/powerpc/Makefile.arch
index d22312f..97ae14e 100644
--- a/libc/string/powerpc/Makefile.in
+++ b/libc/string/powerpc/Makefile.arch
@@ -22,7 +22,6 @@ $(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)
diff --git a/libc/string/sh64/Makefile.in b/libc/string/sh64/Makefile.arch
index 1b72895..b691ae1 100644
--- a/libc/string/sh64/Makefile.in
+++ b/libc/string/sh64/Makefile.arch
@@ -17,7 +17,6 @@ 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)
diff --git a/libc/string/sparc/Makefile.in b/libc/string/sparc/Makefile.arch
index 5632715..726140c 100644
--- a/libc/string/sparc/Makefile.in
+++ b/libc/string/sparc/Makefile.arch
@@ -17,7 +17,6 @@ STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STR
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)
diff --git a/libc/string/x86_64/Makefile.in b/libc/string/x86_64/Makefile.arch
index 83cc470..914eab5 100644
--- a/libc/string/x86_64/Makefile.in
+++ b/libc/string/x86_64/Makefile.arch
@@ -17,7 +17,6 @@ STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STR
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)
diff --git a/libc/sysdeps/linux/Makefile.in b/libc/sysdeps/linux/Makefile.in
index a8ae79e..d2a980c 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.in b/libc/sysdeps/linux/arm/Makefile.arch
index 87339cd..e44b145 100644
--- a/libc/sysdeps/linux/arm/Makefile.in
+++ b/libc/sysdeps/linux/arm/Makefile.arch
@@ -21,7 +21,6 @@ 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)
@@ -31,8 +30,3 @@ 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 ce7d8f9..2ddb912 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.in b/libc/sysdeps/linux/i386/Makefile.arch
index 9593b74..3ced8de 100644
--- a/libc/sysdeps/linux/i386/Makefile.in
+++ b/libc/sysdeps/linux/i386/Makefile.arch
@@ -22,7 +22,6 @@ 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)
@@ -32,8 +31,3 @@ 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.in b/libc/sysdeps/linux/mips/Makefile.arch
index e6075d7..5878aa7 100644
--- a/libc/sysdeps/linux/mips/Makefile.in
+++ b/libc/sysdeps/linux/mips/Makefile.arch
@@ -23,7 +23,6 @@ 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)
@@ -32,11 +31,16 @@ libc-nomulti-y+=$(ARCH_OBJS)
objclean-y+=arch_objclean
arch_objclean:
- $(RM) $(ARCH_OUT)/*.{o,os} $(top_builddir)include/sgidefs.h
+ $(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/
- $(LN) -fs ../libc/sysdeps/linux/mips/fpu_control.h $(top_builddir)include/
diff --git a/libc/sysdeps/linux/powerpc/Makefile.in b/libc/sysdeps/linux/powerpc/Makefile.arch
index 3cc5ca5..f0c5d9f 100644
--- a/libc/sysdeps/linux/powerpc/Makefile.in
+++ b/libc/sysdeps/linux/powerpc/Makefile.arch
@@ -21,7 +21,6 @@ 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)
@@ -31,8 +30,3 @@ 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.in b/libc/sysdeps/linux/x86_64/Makefile.arch
index a167993..6752c27 100644
--- a/libc/sysdeps/linux/x86_64/Makefile.in
+++ b/libc/sysdeps/linux/x86_64/Makefile.arch
@@ -21,7 +21,6 @@ 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)
@@ -31,8 +30,3 @@ 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/