Enable IMA

8 files changed, 20 insertions, 15 deletions

diff --git a/libc/misc/file/Makefile.in b/libc/misc/file/Makefile.in
index 4e1d97e9a..9410a887a 100644
--- a/libc/misc/file/Makefile.in
+++ b/libc/misc/file/Makefile.in
@@ -19,7 +19,7 @@ libc-a-y+=$(MISC_FILE_OBJ)
 libc-so-y+=$(MISC_FILE_OBJ:.o=.os)
 
 libc-multi-y+=$(MISC_FILE_DIR)/lockf.c
-libc-nomulti-y+=$(MISC_FILE_OUT)/lockf64.o
+libc-nomulti-$(UCLIBC_HAS_LFS)+=$(MISC_FILE_OUT)/lockf64.o
 
 objclean-y+=misc_file_objclean
 
diff --git a/libc/misc/ftw/Makefile.in b/libc/misc/ftw/Makefile.in
index 50be20aeb..20b8b0e3b 100644
--- a/libc/misc/ftw/Makefile.in
+++ b/libc/misc/ftw/Makefile.in
@@ -11,15 +11,18 @@ MOBJ:=ftw.o ftw64.o
 MISC_FTW_DIR:=$(top_srcdir)libc/misc/ftw
 MISC_FTW_OUT:=$(top_builddir)libc/misc/ftw
 
+ifneq ($(DOMULTI),n)
 # ftw.c has to be rewritten to allow multi
 MISC_FTW_NO_MULTI:=ftw64.o
 MOBJ:=$(filter-out $(MISC_FTW_NO_MULTI),$(MOBJ))
+endif
 
 MISC_FTW_MSRC:=$(MISC_FTW_DIR)/$(MSRC)
 MISC_FTW_MOBJ:=$(patsubst %.o,$(MISC_FTW_OUT)/%.o,$(MOBJ))
+
 MISC_FTW_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_FTW_MOBJ))))
 
-MISC_FTW_OBJS:=$(MISC_FTW_MOBJ) $(MISC_FTW_OUT)/$(MISC_FTW_NO_MULTI)
+MISC_FTW_OBJS:=$(MISC_FTW_MOBJ)
 
 $(MISC_FTW_OBJS): $(MISC_FTW_MSRC)
 	$(compile.m)
diff --git a/libc/misc/glob/Makefile.in b/libc/misc/glob/Makefile.in
index 548a93877..cd845464f 100644
--- a/libc/misc/glob/Makefile.in
+++ b/libc/misc/glob/Makefile.in
@@ -14,7 +14,9 @@ MISC_GLOB_OUT:=$(top_builddir)libc/misc/glob
 MISC_GLOB_SRC:=$(patsubst %.c,$(MISC_GLOB_DIR)/%.c,$(CSRC))
 MISC_GLOB_OBJ:=$(patsubst %.c,$(MISC_GLOB_OUT)/%.o,$(CSRC))
 
-$(MISC_GLOB_OUT)/glob64.o $(MISC_GLOB_OUT)/glob64.os: $(MISC_GLOB_DIR)/glob64.c $(MISC_GLOB_DIR)/glob.c
+$(MISC_GLOB_OUT)/glob64.o: $(MISC_GLOB_DIR)/glob64.c $(MISC_GLOB_DIR)/glob.c
+
+$(MISC_GLOB_OUT)/glob64.os: $(MISC_GLOB_DIR)/glob64.c $(MISC_GLOB_DIR)/glob.c
 
 libc-a-$(UCLIBC_HAS_GLOB)+=$(MISC_GLOB_OBJ)
 libc-so-$(UCLIBC_HAS_GLOB)+=$(MISC_GLOB_OBJ:.o=.os)
diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in
index e2fa8158a..2cdd70609 100644
--- a/libc/misc/locale/Makefile.in
+++ b/libc/misc/locale/Makefile.in
@@ -58,9 +58,8 @@ libc-so-y+=$(MISC_LOCALE_MOBJ:.o=.os)
 libc-so-$(UCLIBC_HAS_LOCALE)+=$(MISC_LOCALE_DATA:.o=.os)
 libc-so-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx:.o=.os)
 
-#CFLAGS-multi-y+=$(MISC_LOCALE_DEF)
-#libc-multi-y+=$(MISC_LOCALE_MSRC)
-libc-nomulti-y+=$(MISC_LOCALE_MOBJ)
+CFLAGS-multi-y+=$(MISC_LOCALE_DEF)
+libc-multi-y+=$(MISC_LOCALE_MSRC)
 libc-nomulti-$(UCLIBC_HAS_LOCALE)+=$(MISC_LOCALE_DATA)
 libc-nomulti-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx)
 
diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in
index 34ae807d9..0bbe0fd36 100644
--- a/libc/misc/pthread/Makefile.in
+++ b/libc/misc/pthread/Makefile.in
@@ -16,8 +16,8 @@ MISC_PTHREAD_OBJ:=$(patsubst %.c,$(MISC_PTHREAD_OUT)/%.o,$(CSRC))
 libc-a-$(UCLIBC_HAS_THREADS)+=$(MISC_PTHREAD_OBJ)
 libc-so-$(UCLIBC_HAS_THREADS)+=$(MISC_PTHREAD_OBJ:.o=.os)
 
-#libc-multi-$(UCLIBC_HAS_THREADS)+=$(MISC_PTHREAD_SRC)
-libc-nomulti-$(UCLIBC_HAS_THREADS)+=$(MISC_PTHREAD_OBJ)
+libc-multi-$(UCLIBC_HAS_THREADS)+=$(MISC_PTHREAD_DIR)/no-tsd.c
+libc-nomulti-$(UCLIBC_HAS_THREADS)+=$(MISC_PTHREAD_OUT)/weaks.o
 
 objclean-y+=misc_pthread_objclean
 
diff --git a/libc/misc/sysvipc/Makefile.in b/libc/misc/sysvipc/Makefile.in
index 9c91c4c53..9a4446cb3 100644
--- a/libc/misc/sysvipc/Makefile.in
+++ b/libc/misc/sysvipc/Makefile.in
@@ -34,8 +34,8 @@ MISC_SYSVIPC_MOBJ3:=$(patsubst %.o,$(MISC_SYSVIPC_OUT)/%.o,$(MOBJ3))
 
 MISC_SYSVIPC_MSRC:=$(MISC_SYSVIPC_MSRC1) $(MISC_SYSVIPC_MSRC2) $(MISC_SYSVIPC_MSRC3)
 MISC_SYSVIPC_MOBJ:=$(MISC_SYSVIPC_MOBJ1) $(MISC_SYSVIPC_MOBJ2) $(MISC_SYSVIPC_MOBJ3)
-# only MSRC2
-MISC_SYSVIPC_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_SYSVIPC_MOBJ2))))
+
+MISC_SYSVIPC_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_SYSVIPC_MOBJ))))
 
 MISC_SYSVIPC_OBJS:=$(MISC_SYSVIPC_OBJ) $(MISC_SYSVIPC_MOBJ)
 
@@ -61,8 +61,7 @@ libc-a-y+=$(MISC_SYSVIPC_OBJS)
 libc-so-y+=$(MISC_SYSVIPC_OBJS:.o=.os)
 
 CFLAGS-multi-y+=$(MISC_SYSVIPC_DEF)
-libc-multi-y+=$(MISC_SYSVIPC_SRC) $(MISC_SYSVIPC_MSRC2)
-libc-nomulti-y+=$(MISC_SYSVIPC_MOBJ1) $(MISC_SYSVIPC_MOBJ3)
+libc-multi-y+=$(MISC_SYSVIPC_SRC) $(MISC_SYSVIPC_MSRC)
 
 objclean-y+=misc_sysvipc_objclean
 
diff --git a/libc/misc/time/Makefile.in b/libc/misc/time/Makefile.in
index 91ca6e396..1588bed0e 100644
--- a/libc/misc/time/Makefile.in
+++ b/libc/misc/time/Makefile.in
@@ -32,7 +32,10 @@ CSRC:=adjtime.c ftime.c
 MISC_TIME_DIR:=$(top_srcdir)libc/misc/time
 MISC_TIME_OUT:=$(top_builddir)libc/misc/time
 
+ifndef ($(DOMULTI),n)
 MISC_TIME_NO_MULTI:=strftime.o
+MOBJ:=$(filter-out $(MISC_TIME_NO_MULTI),$(MOBJ))
+endif
 
 MISC_TIME_SRC:=$(patsubst %.c,$(MISC_TIME_DIR)/%.c,$(CSRC))
 MISC_TIME_OBJ:=$(patsubst %.c,$(MISC_TIME_OUT)/%.o,$(CSRC))
@@ -41,7 +44,7 @@ MISC_TIME_MSRC:=$(patsubst %.c,$(MISC_TIME_DIR)/%.c,$(MSRC))
 MISC_TIME_MOBJ:=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MOBJ))
 MISC_TIME_MOBJx=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MOBJx))
 
-MISC_TIME_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(filter-out $(MISC_TIME_OUT)/$(MISC_TIME_NO_MULTI),$(MISC_TIME_MOBJ)))))
+MISC_TIME_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_TIME_MOBJ))))
 
 MISC_TIME_OBJS:=$(MISC_TIME_OBJ) $(MISC_TIME_MOBJ)
 
@@ -64,7 +67,7 @@ libc-so-$(UCLIBC_HAS_XLOCALE)+=$(MISC_TIME_MOBJx:.o=.os)
 
 CFLAGS-multi-y+=$(MISC_TIME_DEF)
 libc-multi-y+=$(MISC_TIME_MSRC)
-libc-nomulti-y+=$(MISC_TIME_OUT)/$(MISC_TIME_NO_MULTI)
+libc-nomulti-y+=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MISC_TIME_NO_MULTI))
 libc-nomulti-$(UCLIBC_HAS_XLOCALE)+=$(MISC_TIME_MOBJx)
 
 objclean-y+=misc_time_objclean
diff --git a/libc/misc/wctype/Makefile.in b/libc/misc/wctype/Makefile.in
index b7bdbd8f8..c6855cd21 100644
--- a/libc/misc/wctype/Makefile.in
+++ b/libc/misc/wctype/Makefile.in
@@ -24,7 +24,6 @@ MISC_WCTYPE_MSRC:=$(MISC_WCTYPE_DIR)/$(MSRC)
 MISC_WCTYPE_MOBJ:=$(patsubst %.o,$(MISC_WCTYPE_OUT)/%.o,$(MOBJ))
 MISC_WCTYPE_MOBJx=$(patsubst %.o,$(MISC_WCTYPE_OUT)/%.o,$(MOBJx))
 
-# adapt this if MOBJx is done for multi
 MISC_WCTYPE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_WCTYPE_MOBJ))))
 
 $(MISC_WCTYPE_MOBJ): $(MISC_WCTYPE_MSRC)