Sort lists of input files (WebAssembly#313)

For reproducible .a files in spite of non-deterministic
filesystem readdir order

Without this patch, find returned files in filesystem order
and llvm-ar used that order to create .a files.

Author: Bernhard M. Wiedemann

Makefile

@@ -51,8 +51,9 @@ LIBC_BOTTOM_HALF_HEADERS_PUBLIC = $(LIBC_BOTTOM_HALF_DIR)/headers/public
 LIBC_BOTTOM_HALF_HEADERS_PRIVATE = $(LIBC_BOTTOM_HALF_DIR)/headers/private
 LIBC_BOTTOM_HALF_SOURCES = $(LIBC_BOTTOM_HALF_DIR)/sources
 LIBC_BOTTOM_HALF_ALL_SOURCES = \
+    $(sort \
     $(shell find $(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC) -name \*.c) \
-    $(shell find $(LIBC_BOTTOM_HALF_SOURCES) -name \*.c)
+    $(shell find $(LIBC_BOTTOM_HALF_SOURCES) -name \*.c))
 
 # FIXME(https://reviews.llvm.org/D85567) - due to a bug in LLD the weak
 # references to a function defined in `chdir.c` only work if `chdir.c` is at the
@@ -62,13 +63,13 @@ LIBC_BOTTOM_HALF_ALL_SOURCES := $(filter-out $(LIBC_BOTTOM_HALF_SOURCES)/chdir.c
 LIBC_BOTTOM_HALF_ALL_SOURCES := $(LIBC_BOTTOM_HALF_ALL_SOURCES) $(LIBC_BOTTOM_HALF_SOURCES)/chdir.c
 
 LIBWASI_EMULATED_MMAN_SOURCES = \
-    $(shell find $(LIBC_BOTTOM_HALF_DIR)/mman -name \*.c)
+    $(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/mman -name \*.c))
 LIBWASI_EMULATED_PROCESS_CLOCKS_SOURCES = \
-    $(shell find $(LIBC_BOTTOM_HALF_DIR)/clocks -name \*.c)
+    $(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/clocks -name \*.c))
 LIBWASI_EMULATED_GETPID_SOURCES = \
-    $(shell find $(LIBC_BOTTOM_HALF_DIR)/getpid -name \*.c)
+    $(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/getpid -name \*.c))
 LIBWASI_EMULATED_SIGNAL_SOURCES = \
-    $(shell find $(LIBC_BOTTOM_HALF_DIR)/signal -name \*.c)
+    $(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/signal -name \*.c))
 LIBC_BOTTOM_HALF_CRT_SOURCES = $(wildcard $(LIBC_BOTTOM_HALF_DIR)/crt/*.c)
 LIBC_TOP_HALF_DIR = $(CURDIR)/libc-top-half
 LIBC_TOP_HALF_MUSL_DIR = $(LIBC_TOP_HALF_DIR)/musl
@@ -226,7 +227,7 @@ LIBC_TOP_HALF_HEADERS_PRIVATE = $(LIBC_TOP_HALF_DIR)/headers/private
 LIBC_TOP_HALF_SOURCES = $(LIBC_TOP_HALF_DIR)/sources
 LIBC_TOP_HALF_ALL_SOURCES = \
     $(LIBC_TOP_HALF_MUSL_SOURCES) \
-    $(shell find $(LIBC_TOP_HALF_SOURCES) -name \*.c)
+    $(sort $(shell find $(LIBC_TOP_HALF_SOURCES) -name \*.c))
 
 # Add any extra flags
 CFLAGS = $(EXTRA_CFLAGS)

expected/wasm32-wasi/defined-symbols.txt

@@ -96,8 +96,6 @@ __fsmu8
 __ftello
 __ftello_unlocked
 __funcs_on_exit
-__funcs_on_exit
-__funcs_on_quick_exit
 __funcs_on_quick_exit
 __futimesat
 __fwritable
@@ -164,7 +162,6 @@ __isxdigit_l
 __lctrans
 __lctrans_cur
 __lctrans_impl
-__lctrans_impl
 __ldexp_cexp
 __ldexp_cexpf
 __ldso_atfork
@@ -292,23 +289,17 @@ __stack_chk_fail_local
 __stack_chk_guard
 __stderr_FILE
 __stderr_used
-__stderr_used
-__stderr_used
 __stdin_FILE
 __stdin_used
-__stdin_used
 __stdio_close
 __stdio_exit
-__stdio_exit
 __stdio_exit_needed
 __stdio_ofl_lockptr
 __stdio_read
 __stdio_seek
 __stdio_write
 __stdout_FILE
 __stdout_used
-__stdout_used
-__stdout_used
 __stdout_write
 __stpcpy
 __stpncpy
@@ -503,7 +494,6 @@ __wasilibc_deinitialize_environ
 __wasilibc_dttoif
 __wasilibc_ensure_environ
 __wasilibc_environ
-__wasilibc_environ
 __wasilibc_environ_init
 __wasilibc_fd_renumber
 __wasilibc_find_abspath
@@ -521,7 +511,6 @@ __wasilibc_link_newat
 __wasilibc_link_oldat
 __wasilibc_longjmp
 __wasilibc_maybe_reinitialize_environ_eagerly
-__wasilibc_maybe_reinitialize_environ_eagerly
 __wasilibc_nocwd___wasilibc_rmdirat
 __wasilibc_nocwd___wasilibc_unlinkat
 __wasilibc_nocwd_faccessat
@@ -569,7 +558,6 @@ _initialize
 _pthread_cleanup_pop
 _pthread_cleanup_push
 _start
-_start
 a64l
 abort
 abs
@@ -967,7 +955,6 @@ getrandom
 getrlimit
 getrlimit64
 getrusage
-getrusage
 getsid
 getsockname
 getsockopt
@@ -977,7 +964,6 @@ getspnam_r
 getsubopt
 gettext
 gettimeofday
-gettimeofday
 getuid
 getw
 getwc

expected/wasm64-wasi/defined-symbols.txt

@@ -96,8 +96,6 @@ __fsmu8
 __ftello
 __ftello_unlocked
 __funcs_on_exit
-__funcs_on_exit
-__funcs_on_quick_exit
 __funcs_on_quick_exit
 __futimesat
 __fwritable
@@ -164,7 +162,6 @@ __isxdigit_l
 __lctrans
 __lctrans_cur
 __lctrans_impl
-__lctrans_impl
 __ldexp_cexp
 __ldexp_cexpf
 __ldso_atfork
@@ -292,23 +289,17 @@ __stack_chk_fail_local
 __stack_chk_guard
 __stderr_FILE
 __stderr_used
-__stderr_used
-__stderr_used
 __stdin_FILE
 __stdin_used
-__stdin_used
 __stdio_close
 __stdio_exit
-__stdio_exit
 __stdio_exit_needed
 __stdio_ofl_lockptr
 __stdio_read
 __stdio_seek
 __stdio_write
 __stdout_FILE
 __stdout_used
-__stdout_used
-__stdout_used
 __stdout_write
 __stpcpy
 __stpncpy
@@ -503,7 +494,6 @@ __wasilibc_deinitialize_environ
 __wasilibc_dttoif
 __wasilibc_ensure_environ
 __wasilibc_environ
-__wasilibc_environ
 __wasilibc_environ_init
 __wasilibc_fd_renumber
 __wasilibc_find_abspath
@@ -521,7 +511,6 @@ __wasilibc_link_newat
 __wasilibc_link_oldat
 __wasilibc_longjmp
 __wasilibc_maybe_reinitialize_environ_eagerly
-__wasilibc_maybe_reinitialize_environ_eagerly
 __wasilibc_nocwd___wasilibc_rmdirat
 __wasilibc_nocwd___wasilibc_unlinkat
 __wasilibc_nocwd_faccessat
@@ -569,7 +558,6 @@ _initialize
 _pthread_cleanup_pop
 _pthread_cleanup_push
 _start
-_start
 a64l
 abort
 abs
@@ -967,7 +955,6 @@ getrandom
 getrlimit
 getrlimit64
 getrusage
-getrusage
 getsid
 getsockname
 getsockopt
@@ -977,7 +964,6 @@ getspnam_r
 getsubopt
 gettext
 gettimeofday
-gettimeofday
 getuid
 getw
 getwc