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

@@ -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) {} \;
 

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

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

libc/string/arm/Makefile.in → 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)

libc/string/frv/Makefile.in → 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)

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)

libc/string/i386/Makefile.in → 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)

libc/string/mips/Makefile.in → 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)

libc/string/powerpc/Makefile.in → 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)

libc/string/sh64/Makefile.in → 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)

libc/string/sparc/Makefile.in → 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)

libc/string/x86_64/Makefile.in → 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)

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

libc/sysdeps/linux/arm/Makefile.in → 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/

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/

libc/sysdeps/linux/i386/Makefile.in → 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/

libc/sysdeps/linux/mips/Makefile.in → 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/

libc/sysdeps/linux/powerpc/Makefile.in → 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/

libc/sysdeps/linux/x86_64/Makefile.in → 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/

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

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)