generate separate .so files for emulated features

Signed-off-by: Joel Dice <[email protected]>

Author: dicej

Makefile

@@ -485,17 +485,18 @@ LIBC_BOTTOM_HALF_ALL_SO_OBJS = $(patsubst %.o,%.pic.o,$(LIBC_BOTTOM_HALF_ALL_OBJ
 LIBC_TOP_HALF_ALL_SO_OBJS = $(patsubst %.o,%.pic.o,$(LIBC_TOP_HALF_ALL_OBJS))
 
 # TODO: specify SDK version, e.g. libc.so.wasi-sdk-21, as SO_NAME once `wasm-ld` supports it
-$(SYSROOT_LIB)/libc.so: $(SYSROOT_LIB)/libc.so.a $(BUILTINS_LIB)
+$(SYSROOT_LIB)/%.so: $(OBJDIR)/%.so.a $(BUILTINS_LIB)
 	$(CC) -nostdlib -shared -o $@ -Wl,--whole-archive $< -Wl,--no-whole-archive $(BUILTINS_LIB)
 
-$(SYSROOT_LIB)/libc.so.a: \
-		$(LIBC_SO_OBJS) \
-		$(MUSL_PRINTSCAN_LONG_DOUBLE_SO_OBJS) \
-		$(LIBWASI_EMULATED_MMAN_SO_OBJS) \
-		$(LIBWASI_EMULATED_PROCESS_CLOCKS_SO_OBJS) \
-		$(LIBWASI_EMULATED_GETPID_SO_OBJS) \
-		$(LIBWASI_EMULATED_SIGNAL_SO_OBJS) \
-		$(LIBWASI_EMULATED_SIGNAL_MUSL_SO_OBJS)
+$(OBJDIR)/libc.so.a: $(LIBC_SO_OBJS) $(MUSL_PRINTSCAN_LONG_DOUBLE_SO_OBJS)
+
+$(OBJDIR)/libwasi-emulated-mman.so.a: $(LIBWASI_EMULATED_MMAN_SO_OBJS)
+
+$(OBJDIR)/libwasi-emulated-process-clocks.so.a: $(LIBWASI_EMULATED_PROCESS_CLOCKS_SO_OBJS)
+
+$(OBJDIR)/libwasi-emulated-getpid.so.a: $(LIBWASI_EMULATED_GETPID_SO_OBJS)
+
+$(OBJDIR)/libwasi-emulated-signal.so.a: $(LIBWASI_EMULATED_SIGNAL_SO_OBJS) $(LIBWASI_EMULATED_SIGNAL_MUSL_SO_OBJS)
 
 $(SYSROOT_LIB)/libc.a: $(LIBC_OBJS)
 
@@ -633,7 +634,12 @@ startup_files: include_dirs $(LIBC_BOTTOM_HALF_CRT_OBJS)
 # code, and I'm not sure how to make it position-independent.  Once we've done
 # that, we can enable libc.so for the wasi-threads build.
 ifneq ($(THREAD_MODEL), posix)
-LIBC_SO = $(SYSROOT_LIB)/libc.so
+LIBC_SO = \
+	$(SYSROOT_LIB)/libc.so \
+	$(SYSROOT_LIB)/libwasi-emulated-mman.so \
+	$(SYSROOT_LIB)/libwasi-emulated-process-clocks.so \
+	$(SYSROOT_LIB)/libwasi-emulated-getpid.so \
+	$(SYSROOT_LIB)/libwasi-emulated-signal.so
 endif
 
 libc_so: include_dirs $(LIBC_SO)

libc-top-half/musl/src/internal/locale_impl.h

@@ -28,7 +28,7 @@ extern hidden const struct __locale_struct __c_dot_utf8_locale;
 hidden const struct __locale_map *__get_locale(int, const char *);
 hidden const char *__mo_lookup(const void *, size_t, const char *);
 hidden const char *__lctrans(const char *, const struct __locale_map *);
-hidden const char *__lctrans_cur(const char *);
+const char *__lctrans_cur(const char *);
 hidden const char *__lctrans_impl(const char *, const struct __locale_map *);
 hidden int __loc_is_allocated(locale_t);
 hidden char *__gettextdomain(void);