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

17 files changed, 9 insertions, 44 deletions

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.in b/libc/string/arm/Makefile.arch
index 0f9502d14..f4069d9d1 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 649998325..5b5230088 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 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.in b/libc/string/i386/Makefile.arch
index 2935c8355..65f461cbb 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 2ba596b95..8aebbe27b 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 d22312fe0..97ae14e7f 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 1b728958a..b691ae1d7 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 563271518..726140c1b 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 83cc470c9..914eab55c 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 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.in b/libc/sysdeps/linux/arm/Makefile.arch
index 87339cd0d..e44b145f9 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 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.in b/libc/sysdeps/linux/i386/Makefile.arch
index 9593b7405..3ced8debd 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 e6075d7f6..5878aa708 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 3cc5ca539..f0c5d9f02 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 a167993a2..6752c275d 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/