summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in12
-rwxr-xr-xextra/scripts/create_links.sh7
-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
-rw-r--r--libm/Makefile.in2
-rw-r--r--libm/powerpc/Makefile.arch (renamed from libm/powerpc/Makefile.in)0
-rw-r--r--libpthread/linuxthreads/Makefile.in2
-rw-r--r--libpthread/linuxthreads/sysdeps/sh64/Makefile.arch (renamed from libpthread/linuxthreads/sysdeps/sh64/Makefile.in)0
23 files changed, 24 insertions, 52 deletions
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.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/
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.in b/libm/powerpc/Makefile.arch
index c6d39676a..c6d39676a 100644
--- a/libm/powerpc/Makefile.in
+++ b/libm/powerpc/Makefile.arch
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.in b/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch
index 38cd12db6..38cd12db6 100644
--- a/libpthread/linuxthreads/sysdeps/sh64/Makefile.in
+++ b/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 22:19:26 +0000