4 files changed, 10 insertions, 2 deletions
diff --git a/libc/misc/file/Makefile.in b/libc/misc/file/Makefile.in
index b5f0ec4b3..bc3b2f124 100644
--- a/libc/misc/file/Makefile.in
+++ b/libc/misc/file/Makefile.in
@@ -17,7 +17,9 @@ MISC_FILE_OBJ := $(patsubst $(MISC_FILE_DIR)/%.c,$(MISC_FILE_OUT)/%.o,$(MISC_FIL
 
 libc-y += $(MISC_FILE_OBJ)
 
+libc-nomulti-$(UCLIBC_HAS_LFS) += $(MISC_FILE_OUT)/lockf64.o
+
 objclean-y += misc_file_objclean
 
 misc_file_objclean:
-	$(RM) $(MISC_FILE_OUT)/*.{o,os}
+	$(RM) $(MISC_FILE_OUT)/*.{o,os,oS}
diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in
index 70712b834..ac5482a01 100644
--- a/libc/misc/internals/Makefile.in
+++ b/libc/misc/internals/Makefile.in
@@ -20,6 +20,8 @@ libc-y += $(MISC_INTERNALS_OBJ)
 libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.oS
 libc-static-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o
 
+libc-nomulti-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o
+
 objclean-y += misc_internals_objclean
 
 misc_internals_objclean:
diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in
index b7821888d..3e0f5a780 100644
--- a/libc/misc/pthread/Makefile.in
+++ b/libc/misc/pthread/Makefile.in
@@ -11,6 +11,8 @@ MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread
 libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o
 libc-shared-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/no-tsd.oS
 
+libc-nomulti-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/no-tsd.o
+
 objclean-y += misc_pthread_objclean
 
 misc_pthread_objclean:
diff --git a/libc/misc/statfs/Makefile.in b/libc/misc/statfs/Makefile.in
index 7858c8351..c979b2255 100644
--- a/libc/misc/statfs/Makefile.in
+++ b/libc/misc/statfs/Makefile.in
@@ -18,7 +18,9 @@ MISC_STATFS_OBJ := $(patsubst %.c,$(MISC_STATFS_OUT)/%.o,$(CSRC))
 
 libc-y += $(MISC_STATFS_OBJ)
 
+libc-nomulti-$(UCLIBC_HAS_LFS) += $(MISC_STATFS_OUT)/statvfs64.o $(MISC_STATFS_OUT)/fstatvfs64.o
+
 objclean-y += misc_statfs_objclean
 
 misc_statfs_objclean:
-	$(RM) $(MISC_STATFS_OUT)/*.{o,os}
+	$(RM) $(MISC_STATFS_OUT)/*.{o,os,oS}