libc-{a,so,multi}-y replaced by libc-y covering common objects both in libc.a/libc.so, the diffs go into libc-static-y/libc-shared-y exclusively, add IMA to libc, don't use any MSRC anymore

1 files changed, 37 insertions, 45 deletions

diff --git a/libc/string/Makefile.in b/libc/string/Makefile.in
index f11f5bc4d..0a908eb58 100644
--- a/libc/string/Makefile.in
+++ b/libc/string/Makefile.in
@@ -8,112 +8,104 @@
 #
 # Arch specific fun
 #
-STRING_ARCH_DIR:=$(top_srcdir)libc/string/$(TARGET_ARCH)
-STRING_ARCH_OUT:=$(top_builddir)libc/string/$(TARGET_ARCH)
+STRING_ARCH_DIR := $(top_srcdir)libc/string/$(TARGET_ARCH)
+STRING_ARCH_OUT := $(top_builddir)libc/string/$(TARGET_ARCH)
 
-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_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_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)
+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-$(UCLIBC_HAS_STRING_ARCH_OPT) += $(STRING_ARCH_OBJS)
 
-libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC)
-libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SOBJ)
+libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT) += $(STRING_ARCH_SOBJ)
 
 #
 # Generic stuff
 #
-STRING_GENERIC_DIR:=$(top_srcdir)libc/string/generic
-STRING_GENERIC_OUT:=$(top_builddir)libc/string/generic
+STRING_GENERIC_DIR := $(top_srcdir)libc/string/generic
+STRING_GENERIC_OUT := $(top_builddir)libc/string/generic
 
-STRING_GENERIC_SRC:=$(wildcard $(STRING_GENERIC_DIR)/*.c)
+STRING_GENERIC_SRC := $(wildcard $(STRING_GENERIC_DIR)/*.c)
 
 ifeq ($(UCLIBC_HAS_STRING_ARCH_OPT),y)
 ifneq ($(strip $(STRING_ARCH_OBJS)),)
-STRING_GENERIC_SRC:=$(filter-out $(patsubst %.o,$(STRING_GENERIC_DIR)/%.c,$(notdir $(STRING_ARCH_OBJS))),$(STRING_GENERIC_SRC))
+STRING_GENERIC_SRC := $(filter-out $(patsubst %.o,$(STRING_GENERIC_DIR)/%.c,$(notdir $(STRING_ARCH_OBJS))),$(STRING_GENERIC_SRC))
 endif
 endif
 
-STRING_GENERIC_OBJS:=$(patsubst $(STRING_GENERIC_DIR)/%.c,$(STRING_GENERIC_OUT)/%.o,$(STRING_GENERIC_SRC))
+STRING_GENERIC_OBJS := $(patsubst $(STRING_GENERIC_DIR)/%.c,$(STRING_GENERIC_OUT)/%.o,$(STRING_GENERIC_SRC))
 
-libc-a-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS)
-libc-so-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS:.o=.os)
-
-libc-multi-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_SRC)
+libc-$(UCLIBC_HAS_STRING_GENERIC_OPT) += $(STRING_GENERIC_OBJS)
 
 #
 # Top level string
 #
-STRING_DIR:=$(top_srcdir)libc/string
-STRING_OUT:=$(top_builddir)libc/string
+STRING_DIR := $(top_srcdir)libc/string
+STRING_OUT := $(top_builddir)libc/string
 
-STRING_ALL_WXSRC:=$(wildcard $(STRING_DIR)/w*_l.c)
+STRING_ALL_WXSRC := $(wildcard $(STRING_DIR)/w*_l.c)
 ifeq ($(UCLIBC_HAS_LOCALE),y)
-STRING_WXSRC:=$(STRING_ALL_WXSRC)
+STRING_WXSRC := $(STRING_ALL_WXSRC)
 else
 # wcscoll_l
-STRING_WXSRC:=$(filter-out $(STRING_DIR)/wcsxfrm_l.c,$(STRING_ALL_WXSRC))
+STRING_WXSRC := $(filter-out $(STRING_DIR)/wcsxfrm_l.c,$(STRING_ALL_WXSRC))
 endif
 
-STRING_ALL_XLSRC:=$(filter-out $(STRING_ALL_WXSRC),$(wildcard $(STRING_DIR)/*_l.c))
+STRING_ALL_XLSRC := $(filter-out $(STRING_ALL_WXSRC),$(wildcard $(STRING_DIR)/*_l.c))
 ifeq ($(UCLIBC_HAS_LOCALE),y)
-STRING_XLSRC:=$(STRING_ALL_XLSRC)
+STRING_XLSRC := $(STRING_ALL_XLSRC)
 else
 # strcoll_l
-STRING_XLSRC:=$(filter-out $(STRING_DIR)/strxfrm_l.c,$(STRING_ALL_XLSRC))
+STRING_XLSRC := $(filter-out $(STRING_DIR)/strxfrm_l.c,$(STRING_ALL_XLSRC))
 endif
 
-STRING_ALL_WSRC:=$(filter-out $(STRING_ALL_WXSRC),$(wildcard $(STRING_DIR)/w*.c))
+STRING_ALL_WSRC := $(filter-out $(STRING_ALL_WXSRC),$(wildcard $(STRING_DIR)/w*.c))
 ifeq ($(UCLIBC_HAS_LOCALE),y)
-STRING_WSRC:=$(STRING_ALL_WSRC)
+STRING_WSRC := $(STRING_ALL_WSRC)
 else
 # wcscoll
-STRING_WSRC:=$(filter-out $(STRING_DIR)/wcsxfrm.c,$(STRING_ALL_WSRC))
+STRING_WSRC := $(filter-out $(STRING_DIR)/wcsxfrm.c,$(STRING_ALL_WSRC))
 endif
 
-STRING_ALL_CSRC:=$(filter-out $(STRING_ALL_WXSRC) $(STRING_ALL_XLSRC) $(STRING_ALL_WSRC) $(STRING_DIR)/_collate.c,$(wildcard $(STRING_DIR)/*.c))
+STRING_ALL_CSRC := $(filter-out $(STRING_ALL_WXSRC) $(STRING_ALL_XLSRC) $(STRING_ALL_WSRC) $(STRING_DIR)/_collate.c,$(wildcard $(STRING_DIR)/*.c))
 ifeq ($(UCLIBC_HAS_LOCALE),y)
-STRING_CSRC:=$(STRING_ALL_CSRC)
+STRING_CSRC := $(STRING_ALL_CSRC)
 else
 # strcoll
-STRING_CSRC:=$(filter-out $(STRING_DIR)/strxfrm.c,$(STRING_ALL_CSRC))
+STRING_CSRC := $(filter-out $(STRING_DIR)/strxfrm.c,$(STRING_ALL_CSRC))
 endif
 
 ifeq ($(UCLIBC_HAS_WCHAR),y)
-STRING_CSRC+=$(STRING_WSRC)
+STRING_CSRC += $(STRING_WSRC)
 endif
 ifeq ($(UCLIBC_HAS_XLOCALE),y)
-STRING_CSRC+=$(STRING_XLSRC)
+STRING_CSRC += $(STRING_XLSRC)
 ifeq ($(UCLIBC_HAS_WCHAR),y)
-STRING_CSRC+=$(STRING_WXSRC)
+STRING_CSRC += $(STRING_WXSRC)
 endif
 endif
 
 ifeq ($(UCLIBC_HAS_STRING_ARCH_OPT),y)
 ifneq ($(strip $(STRING_ARCH_OBJS)),)
-STRING_CSRC:=$(filter-out $(patsubst %.o,$(STRING_DIR)/%.c,$(notdir $(STRING_ARCH_OBJS))),$(STRING_CSRC))
+STRING_CSRC := $(filter-out $(patsubst %.o,$(STRING_DIR)/%.c,$(notdir $(STRING_ARCH_OBJS))),$(STRING_CSRC))
 endif
 endif
 
 ifeq ($(UCLIBC_HAS_STRING_GENERIC_OPT),y)
 ifneq ($(strip $(STRING_GENERIC_OBJS)),)
-STRING_CSRC:=$(filter-out $(patsubst %.o,$(STRING_DIR)/%.c,$(notdir $(STRING_GENERIC_OBJS))),$(STRING_CSRC))
+STRING_CSRC := $(filter-out $(patsubst %.o,$(STRING_DIR)/%.c,$(notdir $(STRING_GENERIC_OBJS))),$(STRING_CSRC))
 endif
 endif
 
-STRING_COBJ:=$(patsubst $(STRING_DIR)/%.c,$(STRING_OUT)/%.o,$(STRING_CSRC))
-
-libc-a-y+=$(STRING_COBJ)
-libc-so-y+=$(STRING_COBJ:.o=.os)
+STRING_COBJ := $(patsubst $(STRING_DIR)/%.c,$(STRING_OUT)/%.o,$(STRING_CSRC))
 
-libc-multi-y+=$(STRING_CSRC)
+libc-y += $(STRING_COBJ)
 
-objclean-y+=string_objclean
+objclean-y += string_objclean
 
 string_objclean:
 	$(RM) $(STRING_OUT)/{,*/}*.{o,os}