github
/
wasi-libc
mirror of https://github.com/WebAssembly/wasi-libc
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
288 Commits
9 Branches
7 Tags
20 MiB
Tree: 697d5f8425
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '697d5f8425'
${ noResults }
wasi-libc/Makefile

687 lines
25 KiB
Raw Normal View History

Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn't super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
# These variables are specifically meant to be overridable via the make
# command-line.
Override Make's default for CC and AR.
3 years ago
# ?= doesn't work for CC and AR because make has a default value for them.
ifeq ($(origin CC), default)
CC := clang
endif
`WASM_NM` -> `NM` to use standardized env var Progress towards #269
3 years ago
NM ?= $(patsubst %clang,%llvm-nm,$(filter-out ccache sccache,$(CC)))
Override Make's default for CC and AR.
3 years ago
ifeq ($(origin AR), default)
AR = $(patsubst %clang,%llvm-ar,$(filter-out ccache sccache,$(CC)))
endif
`WASM_CFLAGS` -> `EXTRA_CFLAGS` Progress towards #269
3 years ago
EXTRA_CFLAGS ?= -O2 -DNDEBUG
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# The directory where we build the sysroot.
Add Azure Pipelines definition (#78)
5 years ago
SYSROOT ?= $(CURDIR)/sysroot
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# A directory to install to for "make install".
Add Azure Pipelines definition (#78)
5 years ago
INSTALL_DIR ?= /usr/local
Fix `make THREAD_MODEL=posix` (#311) * Fixes for the THREAD_MODEL=posix build * Fix expected symbols from previous commit * Enable `lock` in `random.c` when threads are enabled This uses the `_REENTRANT` definition to indicate when the `lock` should be available. * Disable `aio.h` when compiling for threads In talking to @sunfishcode about `aio.h`, this functionality is not yet a primary concern (it was already disabled in the default, single-threaded mode). Additionally, this change adds expectation lines for the new symbols/includes added and removed by `pthread.h`. This change was reached by running: ```console $ git diff --no-index expected/wasm32-wasi sysroot/share/wasm32-wasi > patch.diff # replace "sysroot/share" with "expected" in `patch.diff` $ git apply patch.diff --reject # manually fix any rejections ``` * Specify the TLS model until LLVM 15 is released The `-ftls-model` configuration can be removed once https://reviews.llvm.org/D130053 makes its way into an upstream release. * Rename `__wasi_libc_pthread_self` to `__wasilibc_pthread_self` The symbol is still undefined, though. * Add different sets of expected output based on THREAD_MODEL * Re-add trailing whitespace to `predefined-macros.txt` @sbc100 wanted to retain the whitespace trailing after certain predefined macro lines. This change restores that whitespace from upstream and re-generates the POSIX version using the following command: ```console $ git diff --no-index expected/wasm32-wasi/posix/predefined-macros.txt sysroot/share/wasm32-wasi/predefined-macros.txt | sed 's/sysroot\/share\/wasm32-wasi/expected\/wasm32-wasi\/posix/' | git apply ``` * Protect `preopens.c` against concurrent access * Only build thread-capable wasi-libc on latest version of Clang * Use `thrd_sleep` from MUSL instead of aliasing `nanosleep` * Define `pthread_setcancelstate` in `THREAD_MODEL=posix` builds There are other options here (e.g., always define the `pthread_*` symbols with stubs) but until we discuss that this is an intermediate working step. * Define a Wasm global to store `pthread_self` * Remove `g_needs_dynamic_alloc` global * Document the state of pthread support * review: de-duplicate symbols based on #314 * review: only define `__wasilibc_cwd_{un}lock` when needed * review: add #ifdefs to `__pthread_setcancelstate` * review: add additional #ifdefs to `pthread_self.c` * review: put lock definition behind #ifdef _REENTRANT * review: remove pthread_setcancelstate.c * review: re-fix indentation * review: alias __clock_nanosleep in bottom half * review: remove extra line Co-authored-by: Sam Clegg <sbc@chromium.org>
2 years ago
# single or posix; note that pthread support is still a work-in-progress.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn't super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
THREAD_MODEL ?= single
Add build flag to select malloc implementation Add a build flag MALLOC_IMPL that can be set to dlmalloc or none (defaulting to dlmalloc) which controls the malloc implementation to use. The dlmalloc option is the same as before, but selecting none removes dlmalloc from the libc build. This flag replaces the BUILD_DLMALLOC flag, which never worked and thus can be removed without breaking any builds. By switching to MALLOC_IMPL, there is a clear path towards a different heap implementation, such as mimalloc.
3 years ago
# dlmalloc or none
MALLOC_IMPL ?= dlmalloc
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# yes or no
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn't super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
BUILD_LIBC_TOP_HALF ?= yes
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# The directory where we're store intermediate artifacts.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn't super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
OBJDIR ?= $(CURDIR)/build
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Implement BULK_MEMORY_THRESHOLD
3 years ago
# When the length is no larger than this threshold, we consider the
# overhead of bulk memory opcodes to outweigh the performance benefit,
# and fall back to the original musl implementation. See
# https://github.com/WebAssembly/wasi-libc/pull/263 for relevant
# discussion
BULK_MEMORY_THRESHOLD ?= 32
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn't super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
# Variables from this point on are not meant to be overridable via the
# make command-line.
# Set the target variables. Multiarch triples notably omit the vendor field,
# which happens to be what we do for the main target triple too.
TARGET_TRIPLE = wasm32-wasi
MULTIARCH_TRIPLE = wasm32-wasi
# These variables describe the locations of various files and directories in
# the source tree.
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
DLMALLOC_DIR = $(CURDIR)/dlmalloc
Add a malloc implementation using dlmalloc.
6 years ago
DLMALLOC_SRC_DIR = $(DLMALLOC_DIR)/src
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
DLMALLOC_SOURCES = $(DLMALLOC_SRC_DIR)/dlmalloc.c
Add a malloc implementation using dlmalloc.
6 years ago
DLMALLOC_INC = $(DLMALLOC_DIR)/include
Port emmalloc to wasi-libc. - Avoid using Emscripten-specific functions - Avoid using a constructor. - Add support for allocating memory at `__heap_base`. - Adjust the max-align value. - Disable functions that wasi-libc doesn't currently publish. - Add `__libc_` aliases.
2 years ago
EMMALLOC_DIR = $(CURDIR)/emmalloc
EMMALLOC_SOURCES = $(EMMALLOC_DIR)/emmalloc.c
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
LIBC_BOTTOM_HALF_DIR = $(CURDIR)/libc-bottom-half
LIBC_BOTTOM_HALF_CLOUDLIBC_SRC = $(LIBC_BOTTOM_HALF_DIR)/cloudlibc/src
LIBC_BOTTOM_HALF_CLOUDLIBC_SRC_INC = $(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC)/include
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 lists of input files (#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.
2 years ago
$(sort \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
$(shell find $(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC) -name \*.c) \
Sort lists of input files (#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.
2 years ago
$(shell find $(LIBC_BOTTOM_HALF_SOURCES) -name \*.c))
Add basic emulation of getcwd/chdir (#214) * Add basic emulation of getcwd/chdir This commit adds basic emulation of a current working directory to wasi-libc. The `getcwd` and `chdir` symbols are now implemented and available for use. The `getcwd` implementation is pretty simple in that it just copies out of a new global, `__wasilibc_cwd`, which defaults to `"/"`. The `chdir` implementation is much more involved and has more ramification, however. A new function, `make_absolute`, was added to the preopens object. Paths stored in the preopen table are now always stored as absolute paths instead of relative paths, and initial relative paths are interpreted as being relative to `/`. Looking up a path to preopen now always turns it into an absolute path, relative to the current working directory, and an appropriate path is then returned. The signature of `__wasilibc_find_relpath` has changed as well. It now returns two path components, one for the absolute part and one for the relative part. Additionally the relative part is always dynamically allocated since it may no longer be a substring of the original input path. This has been tested lightly against the Rust standard library so far, but I'm not a regular C developer so there's likely a few things to improve! * Amortize mallocs made in syscalls * Avoid size bloat on programs that don't use `chdir` * Add threading compat * Collect `link`/`renameat` second path lookup * Update comments about chdir.c in makefile * Move definition of `__wasilibc_find_relpath_alloc` to header * Expand comments * Document the format of strings a bit more * Fixup a few issues in path logic * Fix GitHub Actions
4 years ago
# 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
# end of the archive, but once that LLD review lands and propagates into LLVM
# then we don't have to do this.
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_ALL_SOURCES) $(LIBC_BOTTOM_HALF_SOURCES)/chdir.c
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
LIBWASI_EMULATED_MMAN_SOURCES = \
Sort lists of input files (#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.
2 years ago
$(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/mman -name \*.c))
Emulate `clock`, `times`, and `getrusage` using the monotonic clock. Upcoming WASI snapshots omit the `PROCESS_CPUTIME` clock, since WASI has no inherent concept of processes, and since implementations which don't use a process for each instance don't have a way to implement it efficiently. However, `clock`, `times`, and `getrusage` are useful functions, so provide optional emulated version of them, using the `MONOTONIC` clock. This means these implementations will measure not just the program's own CPU time, but also time spent suspended while other programs are running. Due to this difference in behavior, put these implementations behind a flag. Users must pass `-D_WASI_EMULATED_PROCESS_CLOCK` and link with `-lwasi-emulated-process-clocks` to enable them.
4 years ago
LIBWASI_EMULATED_PROCESS_CLOCKS_SOURCES = \
Sort lists of input files (#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.
2 years ago
$(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/clocks -name \*.c))
Implement emulated support for `getpid`. Add a simple `getpid` emulation function which just returns a fixed value, for applications that just use it for logging.
4 years ago
LIBWASI_EMULATED_GETPID_SOURCES = \
Sort lists of input files (#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.
2 years ago
$(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/getpid -name \*.c))
Replace old <signal.h> support with emulated <signal.h> support. (#183) wasm doesn't support signals, so provide an emulation layer, enabled with -D_WASI_EMULATED_SIGNAL and -lwasi-emulated-signal.
5 years ago
LIBWASI_EMULATED_SIGNAL_SOURCES = \
Sort lists of input files (#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.
2 years ago
$(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/signal -name \*.c))
Replace old <signal.h> support with emulated <signal.h> support. (#183) wasm doesn't support signals, so provide an emulation layer, enabled with -D_WASI_EMULATED_SIGNAL and -lwasi-emulated-signal.
5 years ago
LIBWASI_EMULATED_SIGNAL_MUSL_SOURCES = \
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/signal/psignal.c \
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/string/strsignal.c
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
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
LIBC_TOP_HALF_MUSL_SRC_DIR = $(LIBC_TOP_HALF_MUSL_DIR)/src
LIBC_TOP_HALF_MUSL_INC = $(LIBC_TOP_HALF_MUSL_DIR)/include
LIBC_TOP_HALF_MUSL_SOURCES = \
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn't super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
$(addprefix $(LIBC_TOP_HALF_MUSL_SRC_DIR)/, \
misc/a64l.c \
misc/basename.c \
misc/dirname.c \
misc/ffs.c \
misc/ffsl.c \
misc/ffsll.c \
misc/fmtmsg.c \
misc/getdomainname.c \
misc/gethostid.c \
misc/getopt.c \
misc/getopt_long.c \
misc/getsubopt.c \
misc/uname.c \
misc/nftw.c \
errno/strerror.c \
network/htonl.c \
network/htons.c \
network/ntohl.c \
network/ntohs.c \
network/inet_ntop.c \
network/inet_pton.c \
network/inet_aton.c \
network/in6addr_any.c \
network/in6addr_loopback.c \
fenv/fenv.c \
fenv/fesetround.c \
fenv/feupdateenv.c \
fenv/fesetexceptflag.c \
fenv/fegetexceptflag.c \
fenv/feholdexcept.c \
exit/exit.c \
exit/atexit.c \
exit/assert.c \
exit/quick_exit.c \
exit/at_quick_exit.c \
time/strftime.c \
time/asctime.c \
time/asctime_r.c \
time/ctime.c \
time/ctime_r.c \
time/wcsftime.c \
time/strptime.c \
time/difftime.c \
time/timegm.c \
time/ftime.c \
time/gmtime.c \
time/gmtime_r.c \
time/timespec_get.c \
time/getdate.c \
time/localtime.c \
time/localtime_r.c \
time/mktime.c \
time/__tm_to_secs.c \
time/__month_to_secs.c \
time/__secs_to_tm.c \
time/__year_to_secs.c \
time/__tz.c \
fcntl/creat.c \
dirent/alphasort.c \
dirent/versionsort.c \
env/clearenv.c \
env/getenv.c \
env/putenv.c \
env/setenv.c \
env/unsetenv.c \
unistd/posix_close.c \
Enable support for `utimes` and `futimesat`. These can both be implemented in terms of `utimensat`.
4 years ago
stat/futimesat.c \
Add a `getpagesize` function. (#300) * Add a `getpagesize` function. This adds a `getpagesize` function. This interface is deprecated in POSIX, but it's sufficiently widely used and not problematic in practice. * Use musl's `getpagesize`. * Enable the `getpagesize` declaration in unistd.h.
2 years ago
legacy/getpagesize.c \
Fix `make THREAD_MODEL=posix` (#311) * Fixes for the THREAD_MODEL=posix build * Fix expected symbols from previous commit * Enable `lock` in `random.c` when threads are enabled This uses the `_REENTRANT` definition to indicate when the `lock` should be available. * Disable `aio.h` when compiling for threads In talking to @sunfishcode about `aio.h`, this functionality is not yet a primary concern (it was already disabled in the default, single-threaded mode). Additionally, this change adds expectation lines for the new symbols/includes added and removed by `pthread.h`. This change was reached by running: ```console $ git diff --no-index expected/wasm32-wasi sysroot/share/wasm32-wasi > patch.diff # replace "sysroot/share" with "expected" in `patch.diff` $ git apply patch.diff --reject # manually fix any rejections ``` * Specify the TLS model until LLVM 15 is released The `-ftls-model` configuration can be removed once https://reviews.llvm.org/D130053 makes its way into an upstream release. * Rename `__wasi_libc_pthread_self` to `__wasilibc_pthread_self` The symbol is still undefined, though. * Add different sets of expected output based on THREAD_MODEL * Re-add trailing whitespace to `predefined-macros.txt` @sbc100 wanted to retain the whitespace trailing after certain predefined macro lines. This change restores that whitespace from upstream and re-generates the POSIX version using the following command: ```console $ git diff --no-index expected/wasm32-wasi/posix/predefined-macros.txt sysroot/share/wasm32-wasi/predefined-macros.txt | sed 's/sysroot\/share\/wasm32-wasi/expected\/wasm32-wasi\/posix/' | git apply ``` * Protect `preopens.c` against concurrent access * Only build thread-capable wasi-libc on latest version of Clang * Use `thrd_sleep` from MUSL instead of aliasing `nanosleep` * Define `pthread_setcancelstate` in `THREAD_MODEL=posix` builds There are other options here (e.g., always define the `pthread_*` symbols with stubs) but until we discuss that this is an intermediate working step. * Define a Wasm global to store `pthread_self` * Remove `g_needs_dynamic_alloc` global * Document the state of pthread support * review: de-duplicate symbols based on #314 * review: only define `__wasilibc_cwd_{un}lock` when needed * review: add #ifdefs to `__pthread_setcancelstate` * review: add additional #ifdefs to `pthread_self.c` * review: put lock definition behind #ifdef _REENTRANT * review: remove pthread_setcancelstate.c * review: re-fix indentation * review: alias __clock_nanosleep in bottom half * review: remove extra line Co-authored-by: Sam Clegg <sbc@chromium.org>
2 years ago
thread/thrd_sleep.c \
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn't super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
) \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
$(filter-out %/procfdname.c %/syscall.c %/syscall_ret.c %/vdso.c %/version.c, \
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal/*.c)) \
$(filter-out %/flockfile.c %/funlockfile.c %/__lockfile.c %/ftrylockfile.c \
%/rename.c \
%/tmpnam.c %/tmpfile.c %/tempnam.c \
%/popen.c %/pclose.c \
%/remove.c \
%/gets.c, \
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdio/*.c)) \
$(filter-out %/strsignal.c, \
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/string/*.c)) \
Don't build bind_textdomain_codeset.c (#122) `bind_textdomain_codeset` without the rest of libintl.h isn't useful without the rest of gettext.
5 years ago
$(filter-out %/dcngettext.c %/textdomain.c %/bind_textdomain_codeset.c, \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/locale/*.c)) \
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdlib/*.c) \
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/search/*.c) \
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/multibyte/*.c) \
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/regex/*.c) \
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/prng/*.c) \
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/conf/*.c) \
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/ctype/*.c) \
Remove __fpclassify and __signbit definitions. With fpclassify and signbit now implemented as compiler builtins in a64f6544, these out-of-line helper functions are no longer needed.
6 years ago
$(filter-out %/__signbit.c %/__signbitf.c %/__signbitl.c \
Use builtin functions rather than portable libm implementations. For functions like sqrt, fabs, and others, use the builtin functions, which provide single-instruction implementations, rather than using musl's portable implementations.
6 years ago
%/__fpclassify.c %/__fpclassifyf.c %/__fpclassifyl.c \
%/ceilf.c %/ceil.c \
%/floorf.c %/floor.c \
%/truncf.c %/trunc.c \
%/rintf.c %/rint.c \
%/nearbyintf.c %/nearbyint.c \
%/sqrtf.c %/sqrt.c \
%/fabsf.c %/fabs.c \
Optimize `fmin`, `fmax`, etc. (#120) Use wasm's builtin min and max operators to implement libc `fmin`, `fmax, `fminf`, and `fmaxf`, by handling the NaN cases explicitly. Credit to https://github.com/emscripten-core/emscripten/pull/9689 for spotting this opportunity!
5 years ago
%/copysignf.c %/copysign.c \
%/fminf.c %/fmaxf.c \
%/fmin.c %/fmax.c, \
Remove __fpclassify and __signbit definitions. With fpclassify and signbit now implemented as compiler builtins in a64f6544, these out-of-line helper functions are no longer needed.
6 years ago
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/math/*.c)) \
Implement the cimag/creal functions for all types consistently.
4 years ago
$(filter-out %/crealf.c %/creal.c %creall.c \
%/cimagf.c %/cimag.c %cimagl.c, \
Add complex builtins for creal and cimag too.
6 years ago
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/complex/*.c)) \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/crypt/*.c)
Fix `make THREAD_MODEL=posix` (#311) * Fixes for the THREAD_MODEL=posix build * Fix expected symbols from previous commit * Enable `lock` in `random.c` when threads are enabled This uses the `_REENTRANT` definition to indicate when the `lock` should be available. * Disable `aio.h` when compiling for threads In talking to @sunfishcode about `aio.h`, this functionality is not yet a primary concern (it was already disabled in the default, single-threaded mode). Additionally, this change adds expectation lines for the new symbols/includes added and removed by `pthread.h`. This change was reached by running: ```console $ git diff --no-index expected/wasm32-wasi sysroot/share/wasm32-wasi > patch.diff # replace "sysroot/share" with "expected" in `patch.diff` $ git apply patch.diff --reject # manually fix any rejections ``` * Specify the TLS model until LLVM 15 is released The `-ftls-model` configuration can be removed once https://reviews.llvm.org/D130053 makes its way into an upstream release. * Rename `__wasi_libc_pthread_self` to `__wasilibc_pthread_self` The symbol is still undefined, though. * Add different sets of expected output based on THREAD_MODEL * Re-add trailing whitespace to `predefined-macros.txt` @sbc100 wanted to retain the whitespace trailing after certain predefined macro lines. This change restores that whitespace from upstream and re-generates the POSIX version using the following command: ```console $ git diff --no-index expected/wasm32-wasi/posix/predefined-macros.txt sysroot/share/wasm32-wasi/predefined-macros.txt | sed 's/sysroot\/share\/wasm32-wasi/expected\/wasm32-wasi\/posix/' | git apply ``` * Protect `preopens.c` against concurrent access * Only build thread-capable wasi-libc on latest version of Clang * Use `thrd_sleep` from MUSL instead of aliasing `nanosleep` * Define `pthread_setcancelstate` in `THREAD_MODEL=posix` builds There are other options here (e.g., always define the `pthread_*` symbols with stubs) but until we discuss that this is an intermediate working step. * Define a Wasm global to store `pthread_self` * Remove `g_needs_dynamic_alloc` global * Document the state of pthread support * review: de-duplicate symbols based on #314 * review: only define `__wasilibc_cwd_{un}lock` when needed * review: add #ifdefs to `__pthread_setcancelstate` * review: add additional #ifdefs to `pthread_self.c` * review: put lock definition behind #ifdef _REENTRANT * review: remove pthread_setcancelstate.c * review: re-fix indentation * review: alias __clock_nanosleep in bottom half * review: remove extra line Co-authored-by: Sam Clegg <sbc@chromium.org>
2 years ago
threads: implement support for pthread mutexes (#315) This change adds pthread's mutex support to the `THREAD_MODEL=posix` build of wasi-libc. Some less-common features are unsupported and documented here: - mutex robust lists are disabled and their use will return a runtime error; currently WASI does not support the concept of multiple processes so maintaining robust mutexes across processes does not yet make sense in wasi-libc - timed locks with priority inheritance (PI) are disabled and will act as any other mutex; this feature is related to task priorities which is not yet relevant in the WASI ecosystem (see [priority-inheritance futexes](https://man7.org/linux/man-pages/man2/futex.2.html)) - thread cancellation is ignored; this feature is difficult to support and @sunfishcode would likely want to discuss this before adding it at some later time.
2 years ago
ifeq ($(THREAD_MODEL), posix)
LIBC_TOP_HALF_MUSL_SOURCES += \
$(addprefix $(LIBC_TOP_HALF_MUSL_SRC_DIR)/, \
threads: implement init of TLS and stack pointer (#342) * threads: implement init of TLS and stack pointer * fix: rename wasi_snapshot_preview2_thread_spawn to wasi_thread_spawn Signed-off-by: Harald Hoyer <harald@profian.com> * fix: change signature of wasi_thread_start Signed-off-by: Harald Hoyer <harald@profian.com> * fix: pthread_exit for WASI Can't use `exit()` because it is too high level. Have to unlock the thread list. Signed-off-by: Harald Hoyer <harald@profian.com> * fix: initialize struct pthread for the main thread Signed-off-by: Harald Hoyer <harald@profian.com> * fix: store the aligned stack minus `struct start_args` Signed-off-by: Harald Hoyer <harald@profian.com> Signed-off-by: Harald Hoyer <harald@profian.com> Co-authored-by: Harald Hoyer <harald@profian.com>
2 years ago
env/__init_tls.c \
stdio/__lockfile.c \
threads: Enable __lock file for posix thread model (#337)
2 years ago
thread/__lock.c \
threads: implement support for pthread mutexes (#315) This change adds pthread's mutex support to the `THREAD_MODEL=posix` build of wasi-libc. Some less-common features are unsupported and documented here: - mutex robust lists are disabled and their use will return a runtime error; currently WASI does not support the concept of multiple processes so maintaining robust mutexes across processes does not yet make sense in wasi-libc - timed locks with priority inheritance (PI) are disabled and will act as any other mutex; this feature is related to task priorities which is not yet relevant in the WASI ecosystem (see [priority-inheritance futexes](https://man7.org/linux/man-pages/man2/futex.2.html)) - thread cancellation is ignored; this feature is difficult to support and @sunfishcode would likely want to discuss this before adding it at some later time.
2 years ago
thread/__wait.c \
thread/__timedwait.c \
threads: implement init of TLS and stack pointer (#342) * threads: implement init of TLS and stack pointer * fix: rename wasi_snapshot_preview2_thread_spawn to wasi_thread_spawn Signed-off-by: Harald Hoyer <harald@profian.com> * fix: change signature of wasi_thread_start Signed-off-by: Harald Hoyer <harald@profian.com> * fix: pthread_exit for WASI Can't use `exit()` because it is too high level. Have to unlock the thread list. Signed-off-by: Harald Hoyer <harald@profian.com> * fix: initialize struct pthread for the main thread Signed-off-by: Harald Hoyer <harald@profian.com> * fix: store the aligned stack minus `struct start_args` Signed-off-by: Harald Hoyer <harald@profian.com> Signed-off-by: Harald Hoyer <harald@profian.com> Co-authored-by: Harald Hoyer <harald@profian.com>
2 years ago
thread/default_attr.c \
thread/pthread_attr_destroy.c \
thread/pthread_attr_init.c \
thread/pthread_attr_setstack.c \
thread/pthread_attr_setstacksize.c \
threads: implement support for conditional variables (#323) The implementation is not as efficient as for native Linux platform due to lack of FUTEX_REQUEUE-like system call in WASI. For now we wake all the waiters which is inefficient; if that becomes a bottleneck, I suggest we'll revisit the implementation.
2 years ago
thread/pthread_cleanup_push.c \
thread/pthread_cond_broadcast.c \
thread/pthread_cond_destroy.c \
thread/pthread_cond_init.c \
thread/pthread_cond_signal.c \
thread/pthread_cond_timedwait.c \
thread/pthread_cond_wait.c \
threads: implement support for pthread_condattr (#320)
2 years ago
thread/pthread_condattr_destroy.c \
thread/pthread_condattr_init.c \
thread/pthread_condattr_setclock.c \
thread/pthread_condattr_setpshared.c \
threads: implement `pthread_create` (#325) * threads: implement `pthread_create` As described in the [`wasi-threads`] proposal, this change implements `pthread_create` using the new `wasi_thread_spawn(void *arg)` API. As described there, `wasi-libc` exports the thread entry point with the expected name, `wasi_thread_start`, and then unwraps the passed argument `struct` to invoke the user function with the user argument `struct`. [`wasi-threads`]: https://github.com/WebAssembly/wasi-threads/pull/5 Previously, the TID was only passed to the child thread entry point; the parent thread was forced to wait until the child thread set the TID in the pthread structure. With this change, the TID will be passed not only to the child thread but also returned to the parent thread, so that either side can make progress. The `i32.store` becomes an `i32.atomic.store` to avoid concurrent writes.
2 years ago
thread/pthread_create.c \
threads: enable pthread_join (#336)
2 years ago
thread/pthread_join.c \
threads: implement support for pthread mutexes (#315) This change adds pthread's mutex support to the `THREAD_MODEL=posix` build of wasi-libc. Some less-common features are unsupported and documented here: - mutex robust lists are disabled and their use will return a runtime error; currently WASI does not support the concept of multiple processes so maintaining robust mutexes across processes does not yet make sense in wasi-libc - timed locks with priority inheritance (PI) are disabled and will act as any other mutex; this feature is related to task priorities which is not yet relevant in the WASI ecosystem (see [priority-inheritance futexes](https://man7.org/linux/man-pages/man2/futex.2.html)) - thread cancellation is ignored; this feature is difficult to support and @sunfishcode would likely want to discuss this before adding it at some later time.
2 years ago
thread/pthread_mutex_consistent.c \
thread/pthread_mutex_destroy.c \
thread/pthread_mutex_init.c \
thread/pthread_mutex_getprioceiling.c \
thread/pthread_mutex_lock.c \
thread/pthread_mutex_timedlock.c \
thread/pthread_mutex_trylock.c \
thread/pthread_mutex_unlock.c \
thread/pthread_mutexattr_destroy.c \
thread/pthread_mutexattr_init.c \
thread/pthread_mutexattr_setprotocol.c \
thread/pthread_mutexattr_setpshared.c \
thread/pthread_mutexattr_setrobust.c \
thread/pthread_mutexattr_settype.c \
Implement support for pthread_rwlock (#321) * threads: implement support for pthread_rwlockattr * threads: implement support for pthread_rwlock
2 years ago
thread/pthread_rwlock_destroy.c \
thread/pthread_rwlock_init.c \
thread/pthread_rwlock_rdlock.c \
thread/pthread_rwlock_timedrdlock.c \
thread/pthread_rwlock_timedwrlock.c \
thread/pthread_rwlock_tryrdlock.c \
thread/pthread_rwlock_trywrlock.c \
thread/pthread_rwlock_unlock.c \
thread/pthread_rwlock_wrlock.c \
thread/pthread_rwlockattr_destroy.c \
thread/pthread_rwlockattr_init.c \
thread/pthread_rwlockattr_setpshared.c \
threads: implement `pthread_create` (#325) * threads: implement `pthread_create` As described in the [`wasi-threads`] proposal, this change implements `pthread_create` using the new `wasi_thread_spawn(void *arg)` API. As described there, `wasi-libc` exports the thread entry point with the expected name, `wasi_thread_start`, and then unwraps the passed argument `struct` to invoke the user function with the user argument `struct`. [`wasi-threads`]: https://github.com/WebAssembly/wasi-threads/pull/5 Previously, the TID was only passed to the child thread entry point; the parent thread was forced to wait until the child thread set the TID in the pthread structure. With this change, the TID will be passed not only to the child thread but also returned to the parent thread, so that either side can make progress. The `i32.store` becomes an `i32.atomic.store` to avoid concurrent writes.
2 years ago
thread/pthread_setcancelstate.c \
threads: implement init of TLS and stack pointer (#342) * threads: implement init of TLS and stack pointer * fix: rename wasi_snapshot_preview2_thread_spawn to wasi_thread_spawn Signed-off-by: Harald Hoyer <harald@profian.com> * fix: change signature of wasi_thread_start Signed-off-by: Harald Hoyer <harald@profian.com> * fix: pthread_exit for WASI Can't use `exit()` because it is too high level. Have to unlock the thread list. Signed-off-by: Harald Hoyer <harald@profian.com> * fix: initialize struct pthread for the main thread Signed-off-by: Harald Hoyer <harald@profian.com> * fix: store the aligned stack minus `struct start_args` Signed-off-by: Harald Hoyer <harald@profian.com> Signed-off-by: Harald Hoyer <harald@profian.com> Co-authored-by: Harald Hoyer <harald@profian.com>
2 years ago
thread/pthread_self.c \
threads: implement support for unnamed semaphores (#316) [POSIX semaphores] come in two forms: named and unnamed. Roughly, named semaphores use files to implement locking across processes; unnamed semaphores use a shared memory region to implement locking across threads in the same process. Since WASI currently has no process concept (and it is relatively unclear how to map the WASI files as shared memory), only the unnamed semaphores are supported by this changed. This means that `sem_open`, `sem_close`, and `sem_unlink` will not available to programs compiled with a threads-enabled `wasi-libc`. [POSIX semaphores]: https://man7.org/linux/man-pages/man7/sem_overview.7.html
2 years ago
thread/pthread_testcancel.c \
thread/sem_destroy.c \
thread/sem_getvalue.c \
thread/sem_init.c \
thread/sem_post.c \
thread/sem_timedwait.c \
thread/sem_trywait.c \
thread/sem_wait.c \
threads: implement support for pthread mutexes (#315) This change adds pthread's mutex support to the `THREAD_MODEL=posix` build of wasi-libc. Some less-common features are unsupported and documented here: - mutex robust lists are disabled and their use will return a runtime error; currently WASI does not support the concept of multiple processes so maintaining robust mutexes across processes does not yet make sense in wasi-libc - timed locks with priority inheritance (PI) are disabled and will act as any other mutex; this feature is related to task priorities which is not yet relevant in the WASI ecosystem (see [priority-inheritance futexes](https://man7.org/linux/man-pages/man2/futex.2.html)) - thread cancellation is ignored; this feature is difficult to support and @sunfishcode would likely want to discuss this before adding it at some later time.
2 years ago
)
endif
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
MUSL_PRINTSCAN_SOURCES = \
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal/floatscan.c \
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdio/vfprintf.c \
Add vfwprintf.c to the printscan list. This causes the build to produce no-long-double and no-floating-point versions of this file, following what is done for vfprintf.c.
6 years ago
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdio/vfwprintf.c \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdio/vfscanf.c \
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdlib/strtod.c \
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdlib/wcstod.c
Only apply -mbulk-memory to specific files
3 years ago
BULK_MEMORY_SOURCES = \
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/string/memcpy.c \
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/string/memmove.c \
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/string/memset.c
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
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) \
Sort lists of input files (#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.
2 years ago
$(sort $(shell find $(LIBC_TOP_HALF_SOURCES) -name \*.c))
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
`WASM_CFLAGS` -> `EXTRA_CFLAGS` Progress towards #269
3 years ago
# Add any extra flags
CFLAGS = $(EXTRA_CFLAGS)
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# Set the target.
`WASM_CFLAGS` -> `EXTRA_CFLAGS` Progress towards #269
3 years ago
CFLAGS += --target=$(TARGET_TRIPLE)
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# WebAssembly floating-point match doesn't trap.
# TODO: Add -fno-signaling-nans when the compiler supports it.
Use separate makefile var for CFLAGS (#226) CFLAGS now get initialized with the provided value for WASM_CFLAGS, or its default. This seems to be the intended use case of having `WASM_CFLAGS ?=` at the top of the Makefile. Otherwise, if WASM_CFLAGS is set on the command line, it overrides all CFLAGS and for example `--sysroot` is not added, rendering the build invalid unless it is supplied on the make command line.
4 years ago
CFLAGS += -fno-trapping-math
Ignore a few warnings which occur in third-party code.
4 years ago
# Add all warnings, but disable a few which occur in third-party code.
CFLAGS += -Wall -Wextra -Werror \
-Wno-null-pointer-arithmetic \
Add -Wno-sign-compare too.
4 years ago
-Wno-unused-parameter \
Add -Wno-unused-variable.
4 years ago
-Wno-sign-compare \
Add -Wno-unused-function.
4 years ago
-Wno-unused-variable \
Add -Wno-ignored-attributes.
4 years ago
-Wno-unused-function \
Add -Wno-missing-braces.
4 years ago
-Wno-ignored-attributes \
Add -Wno-ignored-pragmas.
4 years ago
-Wno-missing-braces \
Ignore -Wunused-but-set-variable warnings. This come up when compiling musl with newer clang releases and appear to be harmless.
3 years ago
-Wno-ignored-pragmas \
Build with -Wno-unknown-warning-option too. To suppress the warning about older compilers warning about the flag to suppress the warning that newer compilers are emitting.
3 years ago
-Wno-unused-but-set-variable \
-Wno-unknown-warning-option
Add a malloc implementation using dlmalloc.
6 years ago
# Configure support for threads.
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
ifeq ($(THREAD_MODEL), single)
Only apply -mbulk-memory to specific files
3 years ago
CFLAGS += -mthread-model single
Add a malloc implementation using dlmalloc.
6 years ago
endif
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
ifeq ($(THREAD_MODEL), posix)
Fix `make THREAD_MODEL=posix` (#311) * Fixes for the THREAD_MODEL=posix build * Fix expected symbols from previous commit * Enable `lock` in `random.c` when threads are enabled This uses the `_REENTRANT` definition to indicate when the `lock` should be available. * Disable `aio.h` when compiling for threads In talking to @sunfishcode about `aio.h`, this functionality is not yet a primary concern (it was already disabled in the default, single-threaded mode). Additionally, this change adds expectation lines for the new symbols/includes added and removed by `pthread.h`. This change was reached by running: ```console $ git diff --no-index expected/wasm32-wasi sysroot/share/wasm32-wasi > patch.diff # replace "sysroot/share" with "expected" in `patch.diff` $ git apply patch.diff --reject # manually fix any rejections ``` * Specify the TLS model until LLVM 15 is released The `-ftls-model` configuration can be removed once https://reviews.llvm.org/D130053 makes its way into an upstream release. * Rename `__wasi_libc_pthread_self` to `__wasilibc_pthread_self` The symbol is still undefined, though. * Add different sets of expected output based on THREAD_MODEL * Re-add trailing whitespace to `predefined-macros.txt` @sbc100 wanted to retain the whitespace trailing after certain predefined macro lines. This change restores that whitespace from upstream and re-generates the POSIX version using the following command: ```console $ git diff --no-index expected/wasm32-wasi/posix/predefined-macros.txt sysroot/share/wasm32-wasi/predefined-macros.txt | sed 's/sysroot\/share\/wasm32-wasi/expected\/wasm32-wasi\/posix/' | git apply ``` * Protect `preopens.c` against concurrent access * Only build thread-capable wasi-libc on latest version of Clang * Use `thrd_sleep` from MUSL instead of aliasing `nanosleep` * Define `pthread_setcancelstate` in `THREAD_MODEL=posix` builds There are other options here (e.g., always define the `pthread_*` symbols with stubs) but until we discuss that this is an intermediate working step. * Define a Wasm global to store `pthread_self` * Remove `g_needs_dynamic_alloc` global * Document the state of pthread support * review: de-duplicate symbols based on #314 * review: only define `__wasilibc_cwd_{un}lock` when needed * review: add #ifdefs to `__pthread_setcancelstate` * review: add additional #ifdefs to `pthread_self.c` * review: put lock definition behind #ifdef _REENTRANT * review: remove pthread_setcancelstate.c * review: re-fix indentation * review: alias __clock_nanosleep in bottom half * review: remove extra line Co-authored-by: Sam Clegg <sbc@chromium.org>
2 years ago
# Specify the tls-model until LLVM 15 is released (which should contain
# https://reviews.llvm.org/D130053).
CFLAGS += -mthread-model posix -pthread -ftls-model=local-exec
threads: implement support for pthread_condattr (#320)
2 years ago
# Include cloudlib's directory to access the structure definition of clockid_t
CFLAGS += -I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC)
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
endif
Use `-isystem` instead of `--sysroot` for the installed headers This is less of a sledgehammer, and prepares the way for #270.
3 years ago
# Expose the public headers to the implementation. We use `-isystem` for
# purpose for two reasons:
#
# 1. It only does `<...>` not `"...."` lookup. We are making a libc,
# which is a system library, so all public headers should be
# accessible via `<...>` and never also need `"..."`. `-isystem` main
# purpose is to only effect `<...>` lookup.
#
# 2. The `-I` for private headers added for specific C files below
# should come earlier in the search path, so they can "override"
# and/or `#include_next` the public headers. `-isystem` (like
# `-idirafter`) comes later in the search path than `-I`.
CFLAGS += -isystem "$(SYSROOT_INC)"
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
# These variables describe the locations of various files and directories in
# the build tree.
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
objs = $(patsubst $(CURDIR)/%.c,$(OBJDIR)/%.o,$(1))
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
DLMALLOC_OBJS = $(call objs,$(DLMALLOC_SOURCES))
Port emmalloc to wasi-libc. - Avoid using Emscripten-specific functions - Avoid using a constructor. - Add support for allocating memory at `__heap_base`. - Adjust the max-align value. - Disable functions that wasi-libc doesn&#39;t currently publish. - Add `__libc_` aliases.
2 years ago
EMMALLOC_OBJS = $(call objs,$(EMMALLOC_SOURCES))
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
LIBC_BOTTOM_HALF_ALL_OBJS = $(call objs,$(LIBC_BOTTOM_HALF_ALL_SOURCES))
LIBC_TOP_HALF_ALL_OBJS = $(call objs,$(LIBC_TOP_HALF_ALL_SOURCES))
Add build flag to select malloc implementation Add a build flag MALLOC_IMPL that can be set to dlmalloc or none (defaulting to dlmalloc) which controls the malloc implementation to use. The dlmalloc option is the same as before, but selecting none removes dlmalloc from the libc build. This flag replaces the BUILD_DLMALLOC flag, which never worked and thus can be removed without breaking any builds. By switching to MALLOC_IMPL, there is a clear path towards a different heap implementation, such as mimalloc.
3 years ago
ifeq ($(MALLOC_IMPL),dlmalloc)
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
LIBC_OBJS += $(DLMALLOC_OBJS)
Port emmalloc to wasi-libc. - Avoid using Emscripten-specific functions - Avoid using a constructor. - Add support for allocating memory at `__heap_base`. - Adjust the max-align value. - Disable functions that wasi-libc doesn&#39;t currently publish. - Add `__libc_` aliases.
2 years ago
else ifeq ($(MALLOC_IMPL),emmalloc)
LIBC_OBJS += $(EMMALLOC_OBJS)
Add build flag to select malloc implementation Add a build flag MALLOC_IMPL that can be set to dlmalloc or none (defaulting to dlmalloc) which controls the malloc implementation to use. The dlmalloc option is the same as before, but selecting none removes dlmalloc from the libc build. This flag replaces the BUILD_DLMALLOC flag, which never worked and thus can be removed without breaking any builds. By switching to MALLOC_IMPL, there is a clear path towards a different heap implementation, such as mimalloc.
3 years ago
else ifeq ($(MALLOC_IMPL),none)
# No object files to add.
else
$(error unknown malloc implementation $(MALLOC_IMPL))
Add a malloc implementation using dlmalloc.
6 years ago
endif
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# Add libc-bottom-half's objects.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
LIBC_OBJS += $(LIBC_BOTTOM_HALF_ALL_OBJS)
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
ifeq ($(BUILD_LIBC_TOP_HALF),yes)
# libc-top-half is musl.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
LIBC_OBJS += $(LIBC_TOP_HALF_ALL_OBJS)
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
endif
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
MUSL_PRINTSCAN_OBJS = $(call objs,$(MUSL_PRINTSCAN_SOURCES))
MUSL_PRINTSCAN_LONG_DOUBLE_OBJS = $(patsubst %.o,%.long-double.o,$(MUSL_PRINTSCAN_OBJS))
MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS = $(patsubst %.o,%.no-floating-point.o,$(MUSL_PRINTSCAN_OBJS))
Only apply -mbulk-memory to specific files
3 years ago
BULK_MEMORY_OBJS = $(call objs,$(BULK_MEMORY_SOURCES))
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
LIBWASI_EMULATED_MMAN_OBJS = $(call objs,$(LIBWASI_EMULATED_MMAN_SOURCES))
Emulate `clock`, `times`, and `getrusage` using the monotonic clock. Upcoming WASI snapshots omit the `PROCESS_CPUTIME` clock, since WASI has no inherent concept of processes, and since implementations which don&#39;t use a process for each instance don&#39;t have a way to implement it efficiently. However, `clock`, `times`, and `getrusage` are useful functions, so provide optional emulated version of them, using the `MONOTONIC` clock. This means these implementations will measure not just the program&#39;s own CPU time, but also time spent suspended while other programs are running. Due to this difference in behavior, put these implementations behind a flag. Users must pass `-D_WASI_EMULATED_PROCESS_CLOCK` and link with `-lwasi-emulated-process-clocks` to enable them.
4 years ago
LIBWASI_EMULATED_PROCESS_CLOCKS_OBJS = $(call objs,$(LIBWASI_EMULATED_PROCESS_CLOCKS_SOURCES))
Implement emulated support for `getpid`. Add a simple `getpid` emulation function which just returns a fixed value, for applications that just use it for logging.
4 years ago
LIBWASI_EMULATED_GETPID_OBJS = $(call objs,$(LIBWASI_EMULATED_GETPID_SOURCES))
Replace old &lt;signal.h&gt; support with emulated &lt;signal.h&gt; support. (#183) wasm doesn&#39;t support signals, so provide an emulation layer, enabled with -D_WASI_EMULATED_SIGNAL and -lwasi-emulated-signal.
5 years ago
LIBWASI_EMULATED_SIGNAL_OBJS = $(call objs,$(LIBWASI_EMULATED_SIGNAL_SOURCES))
LIBWASI_EMULATED_SIGNAL_MUSL_OBJS = $(call objs,$(LIBWASI_EMULATED_SIGNAL_MUSL_SOURCES))
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
# These variables describe the locations of various files and
# directories in the generated sysroot tree.
SYSROOT_LIB := $(SYSROOT)/lib/$(MULTIARCH_TRIPLE)
SYSROOT_INC = $(SYSROOT)/include
SYSROOT_SHARE = $(SYSROOT)/share/$(MULTIARCH_TRIPLE)
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Factor out the include-file exclude list into a variable. This also starts categorizing these headers into groups and adding comments explaining their purpose.
6 years ago
# Files from musl's include directory that we don't want to install in the
# sysroot's include directory.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
MUSL_OMIT_HEADERS :=
Factor out the include-file exclude list into a variable. This also starts categorizing these headers into groups and adding comments explaining their purpose.
6 years ago
# Remove files which aren't headers (we generate alltypes.h below).
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
MUSL_OMIT_HEADERS += \
Factor out the include-file exclude list into a variable. This also starts categorizing these headers into groups and adding comments explaining their purpose.
6 years ago
"bits/syscall.h.in" \
"bits/alltypes.h.in" \
"alltypes.h.in"
Omit musl&#39;s stdarg.h and stddef.h from the sysroot. We already use the compiler&#39;s versions of these; this just moves from having libc #include_next them to having libc just omit them entirely, which is simpler. This removes the special code to define musl&#39;s include guard, however I originally added that when I was still working out how WASI&#39;s stddef.h would interact with other code. I believe it&#39;s no longer important.
6 years ago
# Use the compiler's version of these headers.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
MUSL_OMIT_HEADERS += \
Omit musl&#39;s stdarg.h and stddef.h from the sysroot. We already use the compiler&#39;s versions of these; this just moves from having libc #include_next them to having libc just omit them entirely, which is simpler. This removes the special code to define musl&#39;s include guard, however I originally added that when I was still working out how WASI&#39;s stddef.h would interact with other code. I believe it&#39;s no longer important.
6 years ago
"stdarg.h" \
"stddef.h"
Factor out the include-file exclude list into a variable. This also starts categorizing these headers into groups and adding comments explaining their purpose.
6 years ago
# Use the WASI errno definitions.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
MUSL_OMIT_HEADERS += \
Factor out the include-file exclude list into a variable. This also starts categorizing these headers into groups and adding comments explaining their purpose.
6 years ago
"bits/errno.h"
# Remove headers that aren't supported yet or that aren't relevant for WASI.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
MUSL_OMIT_HEADERS += \
Factor out the include-file exclude list into a variable. This also starts categorizing these headers into groups and adding comments explaining their purpose.
6 years ago
"sys/procfs.h" \
"sys/user.h" \
"sys/kd.h" "sys/vt.h" "sys/soundcard.h" "sys/sem.h" \
"sys/shm.h" "sys/msg.h" "sys/ipc.h" "sys/ptrace.h" \
"sys/statfs.h" \
"bits/kd.h" "bits/vt.h" "bits/soundcard.h" "bits/sem.h" \
"bits/shm.h" "bits/msg.h" "bits/ipc.h" "bits/ptrace.h" \
"bits/statfs.h" \
"sys/vfs.h" \
"sys/statvfs.h" \
"syslog.h" "sys/syslog.h" \
"wait.h" "sys/wait.h" \
"ucontext.h" "sys/ucontext.h" \
"paths.h" \
"utmp.h" "utmpx.h" \
"lastlog.h" \
"sys/acct.h" \
"sys/cachectl.h" \
"sys/epoll.h" "sys/reboot.h" "sys/swap.h" \
"sys/sendfile.h" "sys/inotify.h" \
"sys/quota.h" \
"sys/klog.h" \
"sys/fsuid.h" \
"sys/io.h" \
"sys/prctl.h" \
"sys/mtio.h" \
"sys/mount.h" \
"sys/fanotify.h" \
"sys/personality.h" \
"elf.h" "link.h" "bits/link.h" \
"scsi/scsi.h" "scsi/scsi_ioctl.h" "scsi/sg.h" \
"sys/auxv.h" \
"pwd.h" "shadow.h" "grp.h" \
"mntent.h" \
"netdb.h" \
"resolv.h" \
"pty.h" \
"dlfcn.h" \
"setjmp.h" \
"ulimit.h" \
"sys/xattr.h" \
"wordexp.h" \
"spawn.h" \
"sys/membarrier.h" \
"sys/signalfd.h" \
"termios.h" \
"sys/termios.h" \
"bits/termios.h" \
"net/if.h" \
"net/if_arp.h" \
"net/ethernet.h" \
"net/route.h" \
"netinet/if_ether.h" \
"netinet/ether.h" \
Remove more unsupported headers. (#123) utime.h, sysmacros.h, and libintl.h are all currently unsupported. Removing them helps programs that autodetect features based on the existence of headers.
5 years ago
"sys/timerfd.h" \
"libintl.h" \
Fix `make THREAD_MODEL=posix` (#311) * Fixes for the THREAD_MODEL=posix build * Fix expected symbols from previous commit * Enable `lock` in `random.c` when threads are enabled This uses the `_REENTRANT` definition to indicate when the `lock` should be available. * Disable `aio.h` when compiling for threads In talking to @sunfishcode about `aio.h`, this functionality is not yet a primary concern (it was already disabled in the default, single-threaded mode). Additionally, this change adds expectation lines for the new symbols/includes added and removed by `pthread.h`. This change was reached by running: ```console $ git diff --no-index expected/wasm32-wasi sysroot/share/wasm32-wasi &gt; patch.diff # replace &#34;sysroot/share&#34; with &#34;expected&#34; in `patch.diff` $ git apply patch.diff --reject # manually fix any rejections ``` * Specify the TLS model until LLVM 15 is released The `-ftls-model` configuration can be removed once https://reviews.llvm.org/D130053 makes its way into an upstream release. * Rename `__wasi_libc_pthread_self` to `__wasilibc_pthread_self` The symbol is still undefined, though. * Add different sets of expected output based on THREAD_MODEL * Re-add trailing whitespace to `predefined-macros.txt` @sbc100 wanted to retain the whitespace trailing after certain predefined macro lines. This change restores that whitespace from upstream and re-generates the POSIX version using the following command: ```console $ git diff --no-index expected/wasm32-wasi/posix/predefined-macros.txt sysroot/share/wasm32-wasi/predefined-macros.txt | sed &#39;s/sysroot\/share\/wasm32-wasi/expected\/wasm32-wasi\/posix/&#39; | git apply ``` * Protect `preopens.c` against concurrent access * Only build thread-capable wasi-libc on latest version of Clang * Use `thrd_sleep` from MUSL instead of aliasing `nanosleep` * Define `pthread_setcancelstate` in `THREAD_MODEL=posix` builds There are other options here (e.g., always define the `pthread_*` symbols with stubs) but until we discuss that this is an intermediate working step. * Define a Wasm global to store `pthread_self` * Remove `g_needs_dynamic_alloc` global * Document the state of pthread support * review: de-duplicate symbols based on #314 * review: only define `__wasilibc_cwd_{un}lock` when needed * review: add #ifdefs to `__pthread_setcancelstate` * review: add additional #ifdefs to `pthread_self.c` * review: put lock definition behind #ifdef _REENTRANT * review: remove pthread_setcancelstate.c * review: re-fix indentation * review: alias __clock_nanosleep in bottom half * review: remove extra line Co-authored-by: Sam Clegg &lt;sbc@chromium.org&gt;
2 years ago
"sys/sysmacros.h" \
"aio.h"
Factor out the include-file exclude list into a variable. This also starts categorizing these headers into groups and adding comments explaining their purpose.
6 years ago
ifeq ($(THREAD_MODEL), single)
# Remove headers not supported in single-threaded mode.
Fix `make THREAD_MODEL=posix` (#311) * Fixes for the THREAD_MODEL=posix build * Fix expected symbols from previous commit * Enable `lock` in `random.c` when threads are enabled This uses the `_REENTRANT` definition to indicate when the `lock` should be available. * Disable `aio.h` when compiling for threads In talking to @sunfishcode about `aio.h`, this functionality is not yet a primary concern (it was already disabled in the default, single-threaded mode). Additionally, this change adds expectation lines for the new symbols/includes added and removed by `pthread.h`. This change was reached by running: ```console $ git diff --no-index expected/wasm32-wasi sysroot/share/wasm32-wasi &gt; patch.diff # replace &#34;sysroot/share&#34; with &#34;expected&#34; in `patch.diff` $ git apply patch.diff --reject # manually fix any rejections ``` * Specify the TLS model until LLVM 15 is released The `-ftls-model` configuration can be removed once https://reviews.llvm.org/D130053 makes its way into an upstream release. * Rename `__wasi_libc_pthread_self` to `__wasilibc_pthread_self` The symbol is still undefined, though. * Add different sets of expected output based on THREAD_MODEL * Re-add trailing whitespace to `predefined-macros.txt` @sbc100 wanted to retain the whitespace trailing after certain predefined macro lines. This change restores that whitespace from upstream and re-generates the POSIX version using the following command: ```console $ git diff --no-index expected/wasm32-wasi/posix/predefined-macros.txt sysroot/share/wasm32-wasi/predefined-macros.txt | sed &#39;s/sysroot\/share\/wasm32-wasi/expected\/wasm32-wasi\/posix/&#39; | git apply ``` * Protect `preopens.c` against concurrent access * Only build thread-capable wasi-libc on latest version of Clang * Use `thrd_sleep` from MUSL instead of aliasing `nanosleep` * Define `pthread_setcancelstate` in `THREAD_MODEL=posix` builds There are other options here (e.g., always define the `pthread_*` symbols with stubs) but until we discuss that this is an intermediate working step. * Define a Wasm global to store `pthread_self` * Remove `g_needs_dynamic_alloc` global * Document the state of pthread support * review: de-duplicate symbols based on #314 * review: only define `__wasilibc_cwd_{un}lock` when needed * review: add #ifdefs to `__pthread_setcancelstate` * review: add additional #ifdefs to `pthread_self.c` * review: put lock definition behind #ifdef _REENTRANT * review: remove pthread_setcancelstate.c * review: re-fix indentation * review: alias __clock_nanosleep in bottom half * review: remove extra line Co-authored-by: Sam Clegg &lt;sbc@chromium.org&gt;
2 years ago
MUSL_OMIT_HEADERS += "pthread.h"
Factor out the include-file exclude list into a variable. This also starts categorizing these headers into groups and adding comments explaining their purpose.
6 years ago
endif
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
default: finish
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
$(SYSROOT_LIB)/libc.a: $(LIBC_OBJS)
$(SYSROOT_LIB)/libc-printscan-long-double.a: $(MUSL_PRINTSCAN_LONG_DOUBLE_OBJS)
$(SYSROOT_LIB)/libc-printscan-no-floating-point.a: $(MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS)
$(SYSROOT_LIB)/libwasi-emulated-mman.a: $(LIBWASI_EMULATED_MMAN_OBJS)
Emulate `clock`, `times`, and `getrusage` using the monotonic clock. Upcoming WASI snapshots omit the `PROCESS_CPUTIME` clock, since WASI has no inherent concept of processes, and since implementations which don&#39;t use a process for each instance don&#39;t have a way to implement it efficiently. However, `clock`, `times`, and `getrusage` are useful functions, so provide optional emulated version of them, using the `MONOTONIC` clock. This means these implementations will measure not just the program&#39;s own CPU time, but also time spent suspended while other programs are running. Due to this difference in behavior, put these implementations behind a flag. Users must pass `-D_WASI_EMULATED_PROCESS_CLOCK` and link with `-lwasi-emulated-process-clocks` to enable them.
4 years ago
$(SYSROOT_LIB)/libwasi-emulated-process-clocks.a: $(LIBWASI_EMULATED_PROCESS_CLOCKS_OBJS)
Implement emulated support for `getpid`. Add a simple `getpid` emulation function which just returns a fixed value, for applications that just use it for logging.
4 years ago
$(SYSROOT_LIB)/libwasi-emulated-getpid.a: $(LIBWASI_EMULATED_GETPID_OBJS)
Replace old &lt;signal.h&gt; support with emulated &lt;signal.h&gt; support. (#183) wasm doesn&#39;t support signals, so provide an emulation layer, enabled with -D_WASI_EMULATED_SIGNAL and -lwasi-emulated-signal.
5 years ago
$(SYSROOT_LIB)/libwasi-emulated-signal.a: $(LIBWASI_EMULATED_SIGNAL_OBJS) $(LIBWASI_EMULATED_SIGNAL_MUSL_OBJS)
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
%.a:
@mkdir -p "$(@D)"
Add Azure Pipelines definition (#78)
5 years ago
# On Windows, the commandline for the ar invocation got too long, so it needs to be split up.
`WASM_AR` -&gt; `AR` to use standardized env var Progress towards #269
3 years ago
$(AR) crs $@ $(wordlist 1, 199, $^)
$(AR) crs $@ $(wordlist 200, 399, $^)
$(AR) crs $@ $(wordlist 400, 599, $^)
$(AR) crs $@ $(wordlist 600, 799, $^)
Add Azure Pipelines definition (#78)
5 years ago
# This might eventually overflow again, but at least it'll do so in a loud way instead of
# silently dropping the tail.
`WASM_AR` -&gt; `AR` to use standardized env var Progress towards #269
3 years ago
$(AR) crs $@ $(wordlist 800, 100000, $^)
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Use separate makefile var for CFLAGS (#226) CFLAGS now get initialized with the provided value for WASM_CFLAGS, or its default. This seems to be the intended use case of having `WASM_CFLAGS ?=` at the top of the Makefile. Otherwise, if WASM_CFLAGS is set on the command line, it overrides all CFLAGS and for example `--sysroot` is not added, rendering the build invalid unless it is supplied on the make command line.
4 years ago
$(MUSL_PRINTSCAN_OBJS): CFLAGS += \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
-D__wasilibc_printscan_no_long_double \
-D__wasilibc_printscan_full_support_option="\"add -lc-printscan-long-double to the link command\""
Use separate makefile var for CFLAGS (#226) CFLAGS now get initialized with the provided value for WASM_CFLAGS, or its default. This seems to be the intended use case of having `WASM_CFLAGS ?=` at the top of the Makefile. Otherwise, if WASM_CFLAGS is set on the command line, it overrides all CFLAGS and for example `--sysroot` is not added, rendering the build invalid unless it is supplied on the make command line.
4 years ago
$(MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS): CFLAGS += \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
-D__wasilibc_printscan_no_floating_point \
-D__wasilibc_printscan_floating_point_support_option="\"remove -lc-printscan-no-floating-point from the link command\""
Add TODO pointing to LLVM bug report
3 years ago
# TODO: apply -mbulk-memory globally, once
# https://github.com/llvm/llvm-project/issues/52618 is resolved
Only apply -mbulk-memory to specific files
3 years ago
$(BULK_MEMORY_OBJS): CFLAGS += \
-mbulk-memory
Implement BULK_MEMORY_THRESHOLD
3 years ago
$(BULK_MEMORY_OBJS): CFLAGS += \
-DBULK_MEMORY_THRESHOLD=$(BULK_MEMORY_THRESHOLD)
Use separate makefile var for CFLAGS (#226) CFLAGS now get initialized with the provided value for WASM_CFLAGS, or its default. This seems to be the intended use case of having `WASM_CFLAGS ?=` at the top of the Makefile. Otherwise, if WASM_CFLAGS is set on the command line, it overrides all CFLAGS and for example `--sysroot` is not added, rendering the build invalid unless it is supplied on the make command line.
4 years ago
$(LIBWASI_EMULATED_SIGNAL_MUSL_OBJS): CFLAGS += \
Replace old &lt;signal.h&gt; support with emulated &lt;signal.h&gt; support. (#183) wasm doesn&#39;t support signals, so provide an emulation layer, enabled with -D_WASI_EMULATED_SIGNAL and -lwasi-emulated-signal.
5 years ago
-D_WASI_EMULATED_SIGNAL
Makefile: Don&#39;t mix phony targets with directory names Remove build rules for $(SYSROOT) and $(SYSROOT_INC). The latter becomes `include_dirs`. The former is not needed, instead just add startup_files to the finish rule.
6 years ago
$(OBJDIR)/%.long-double.o: $(CURDIR)/%.c include_dirs
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
@mkdir -p "$(@D)"
`WASM_CC` -&gt; `CC` to use standardized env var Progress towards #269
3 years ago
$(CC) $(CFLAGS) -MD -MP -o $@ -c $<
Add initial files. This populates the repo with a very minimal set of files. This is just enough to set out a basic outline. Hopefully as we move forward we&#39;ll be replacing many of these parts, but this is just something basic to get things started. This tree isn&#39;t really usable yet, as it doesn&#39;t yet have an easy way to obtain a compiler-rt/libgcc build.
6 years ago
Makefile: Don&#39;t mix phony targets with directory names Remove build rules for $(SYSROOT) and $(SYSROOT_INC). The latter becomes `include_dirs`. The former is not needed, instead just add startup_files to the finish rule.
6 years ago
$(OBJDIR)/%.no-floating-point.o: $(CURDIR)/%.c include_dirs
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
@mkdir -p "$(@D)"
`WASM_CC` -&gt; `CC` to use standardized env var Progress towards #269
3 years ago
$(CC) $(CFLAGS) -MD -MP -o $@ -c $<
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Makefile: Don&#39;t mix phony targets with directory names Remove build rules for $(SYSROOT) and $(SYSROOT_INC). The latter becomes `include_dirs`. The former is not needed, instead just add startup_files to the finish rule.
6 years ago
$(OBJDIR)/%.o: $(CURDIR)/%.c include_dirs
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
@mkdir -p "$(@D)"
`WASM_CC` -&gt; `CC` to use standardized env var Progress towards #269
3 years ago
$(CC) $(CFLAGS) -MD -MP -o $@ -c $<
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Add Azure Pipelines definition (#78)
5 years ago
-include $(shell find $(OBJDIR) -name \*.d)
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Use separate makefile var for CFLAGS (#226) CFLAGS now get initialized with the provided value for WASM_CFLAGS, or its default. This seems to be the intended use case of having `WASM_CFLAGS ?=` at the top of the Makefile. Otherwise, if WASM_CFLAGS is set on the command line, it overrides all CFLAGS and for example `--sysroot` is not added, rendering the build invalid unless it is supplied on the make command line.
4 years ago
$(DLMALLOC_OBJS): CFLAGS += \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
-I$(DLMALLOC_INC)
Use separate makefile var for CFLAGS (#226) CFLAGS now get initialized with the provided value for WASM_CFLAGS, or its default. This seems to be the intended use case of having `WASM_CFLAGS ?=` at the top of the Makefile. Otherwise, if WASM_CFLAGS is set on the command line, it overrides all CFLAGS and for example `--sysroot` is not added, rendering the build invalid unless it is supplied on the make command line.
4 years ago
startup_files $(LIBC_BOTTOM_HALF_ALL_OBJS): CFLAGS += \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
-I$(LIBC_BOTTOM_HALF_HEADERS_PRIVATE) \
-I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC_INC) \
Use MUSL&#39;s `weak*` feature in bottom half (#306) This change extracts the `weak*`-related parts of #303 as a separate PR. Note that this is slightly strange in that it uses some top-half MUSL headers in the bottom-half code, but discussion around this led me to believe that the advantages of, e.g., `LOCK` made this worthwhile. Beyond just changing uses of `weak` to `__weak__`, we also MUSL&#39;s `weak` and `weak_alias` macros in a few more places.
2 years ago
-I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC) \
-I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/include \
-I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Use separate makefile var for CFLAGS (#226) CFLAGS now get initialized with the provided value for WASM_CFLAGS, or its default. This seems to be the intended use case of having `WASM_CFLAGS ?=` at the top of the Makefile. Otherwise, if WASM_CFLAGS is set on the command line, it overrides all CFLAGS and for example `--sysroot` is not added, rendering the build invalid unless it is supplied on the make command line.
4 years ago
$(LIBC_TOP_HALF_ALL_OBJS) $(MUSL_PRINTSCAN_LONG_DOUBLE_OBJS) $(MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS) $(LIBWASI_EMULATED_SIGNAL_MUSL_OBJS): CFLAGS += \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
-I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/include \
-I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal \
-I$(LIBC_TOP_HALF_MUSL_DIR)/arch/wasm32 \
-I$(LIBC_TOP_HALF_MUSL_DIR)/arch/generic \
-I$(LIBC_TOP_HALF_HEADERS_PRIVATE) \
-Wno-parentheses \
-Wno-shift-op-parentheses \
-Wno-bitwise-op-parentheses \
-Wno-logical-op-parentheses \
-Wno-string-plus-int \
-Wno-dangling-else \
-Wno-unknown-pragmas
Emulate `clock`, `times`, and `getrusage` using the monotonic clock. Upcoming WASI snapshots omit the `PROCESS_CPUTIME` clock, since WASI has no inherent concept of processes, and since implementations which don&#39;t use a process for each instance don&#39;t have a way to implement it efficiently. However, `clock`, `times`, and `getrusage` are useful functions, so provide optional emulated version of them, using the `MONOTONIC` clock. This means these implementations will measure not just the program&#39;s own CPU time, but also time spent suspended while other programs are running. Due to this difference in behavior, put these implementations behind a flag. Users must pass `-D_WASI_EMULATED_PROCESS_CLOCK` and link with `-lwasi-emulated-process-clocks` to enable them.
4 years ago
$(LIBWASI_EMULATED_PROCESS_CLOCKS_OBJS): CFLAGS += \
-I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC)
Makefile: Don&#39;t mix phony targets with directory names Remove build rules for $(SYSROOT) and $(SYSROOT_INC). The latter becomes `include_dirs`. The former is not needed, instead just add startup_files to the finish rule.
6 years ago
include_dirs:
Add initial files. This populates the repo with a very minimal set of files. This is just enough to set out a basic outline. Hopefully as we move forward we&#39;ll be replacing many of these parts, but this is just something basic to get things started. This tree isn&#39;t really usable yet, as it doesn&#39;t yet have an easy way to obtain a compiler-rt/libgcc build.
6 years ago
#
# Install the include files.
#
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
mkdir -p "$(SYSROOT_INC)"
cp -r "$(LIBC_BOTTOM_HALF_HEADERS_PUBLIC)"/* "$(SYSROOT_INC)"
# Generate musl's bits/alltypes.h header.
mkdir -p "$(SYSROOT_INC)/bits"
sed -f $(LIBC_TOP_HALF_MUSL_DIR)/tools/mkalltypes.sed \
$(LIBC_TOP_HALF_MUSL_DIR)/arch/wasm32/bits/alltypes.h.in \
$(LIBC_TOP_HALF_MUSL_DIR)/include/alltypes.h.in \
> "$(SYSROOT_INC)/bits/alltypes.h"
# Copy in the bulk of musl's public header files.
cp -r "$(LIBC_TOP_HALF_MUSL_INC)"/* "$(SYSROOT_INC)"
# Copy in the musl's "bits" header files.
cp -r "$(LIBC_TOP_HALF_MUSL_DIR)"/arch/generic/bits/* "$(SYSROOT_INC)/bits"
cp -r "$(LIBC_TOP_HALF_MUSL_DIR)"/arch/wasm32/bits/* "$(SYSROOT_INC)/bits"
Factor out the include-file exclude list into a variable. This also starts categorizing these headers into groups and adding comments explaining their purpose.
6 years ago
# Remove selected header files.
$(RM) $(patsubst %,$(SYSROOT_INC)/%,$(MUSL_OMIT_HEADERS))
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Makefile: Don&#39;t mix phony targets with directory names Remove build rules for $(SYSROOT) and $(SYSROOT_INC). The latter becomes `include_dirs`. The former is not needed, instead just add startup_files to the finish rule.
6 years ago
startup_files: include_dirs
Add initial files. This populates the repo with a very minimal set of files. This is just enough to set out a basic outline. Hopefully as we move forward we&#39;ll be replacing many of these parts, but this is just something basic to get things started. This tree isn&#39;t really usable yet, as it doesn&#39;t yet have an easy way to obtain a compiler-rt/libgcc build.
6 years ago
#
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# Build the startup files.
Add initial files. This populates the repo with a very minimal set of files. This is just enough to set out a basic outline. Hopefully as we move forward we&#39;ll be replacing many of these parts, but this is just something basic to get things started. This tree isn&#39;t really usable yet, as it doesn&#39;t yet have an easy way to obtain a compiler-rt/libgcc build.
6 years ago
#
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
@mkdir -p "$(OBJDIR)"
cd "$(OBJDIR)" && \
`WASM_CC` -&gt; `CC` to use standardized env var Progress towards #269
3 years ago
$(CC) $(CFLAGS) -c $(LIBC_BOTTOM_HALF_CRT_SOURCES) -MD -MP && \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
mkdir -p "$(SYSROOT_LIB)" && \
mv *.o "$(SYSROOT_LIB)"
Add initial files. This populates the repo with a very minimal set of files. This is just enough to set out a basic outline. Hopefully as we move forward we&#39;ll be replacing many of these parts, but this is just something basic to get things started. This tree isn&#39;t really usable yet, as it doesn&#39;t yet have an easy way to obtain a compiler-rt/libgcc build.
6 years ago
Makefile: Don&#39;t mix phony targets with directory names Remove build rules for $(SYSROOT) and $(SYSROOT_INC). The latter becomes `include_dirs`. The former is not needed, instead just add startup_files to the finish rule.
6 years ago
libc: include_dirs \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
$(SYSROOT_LIB)/libc.a \
$(SYSROOT_LIB)/libc-printscan-long-double.a \
$(SYSROOT_LIB)/libc-printscan-no-floating-point.a \
Replace old &lt;signal.h&gt; support with emulated &lt;signal.h&gt; support. (#183) wasm doesn&#39;t support signals, so provide an emulation layer, enabled with -D_WASI_EMULATED_SIGNAL and -lwasi-emulated-signal.
5 years ago
$(SYSROOT_LIB)/libwasi-emulated-mman.a \
Emulate `clock`, `times`, and `getrusage` using the monotonic clock. Upcoming WASI snapshots omit the `PROCESS_CPUTIME` clock, since WASI has no inherent concept of processes, and since implementations which don&#39;t use a process for each instance don&#39;t have a way to implement it efficiently. However, `clock`, `times`, and `getrusage` are useful functions, so provide optional emulated version of them, using the `MONOTONIC` clock. This means these implementations will measure not just the program&#39;s own CPU time, but also time spent suspended while other programs are running. Due to this difference in behavior, put these implementations behind a flag. Users must pass `-D_WASI_EMULATED_PROCESS_CLOCK` and link with `-lwasi-emulated-process-clocks` to enable them.
4 years ago
$(SYSROOT_LIB)/libwasi-emulated-process-clocks.a \
Implement emulated support for `getpid`. Add a simple `getpid` emulation function which just returns a fixed value, for applications that just use it for logging.
4 years ago
$(SYSROOT_LIB)/libwasi-emulated-getpid.a \
Replace old &lt;signal.h&gt; support with emulated &lt;signal.h&gt; support. (#183) wasm doesn&#39;t support signals, so provide an emulation layer, enabled with -D_WASI_EMULATED_SIGNAL and -lwasi-emulated-signal.
5 years ago
$(SYSROOT_LIB)/libwasi-emulated-signal.a
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Makefile: Don&#39;t mix phony targets with directory names Remove build rules for $(SYSROOT) and $(SYSROOT_INC). The latter becomes `include_dirs`. The former is not needed, instead just add startup_files to the finish rule.
6 years ago
finish: startup_files libc
Add initial files. This populates the repo with a very minimal set of files. This is just enough to set out a basic outline. Hopefully as we move forward we&#39;ll be replacing many of these parts, but this is just something basic to get things started. This tree isn&#39;t really usable yet, as it doesn&#39;t yet have an easy way to obtain a compiler-rt/libgcc build.
6 years ago
#
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# Create empty placeholder libraries.
Add initial files. This populates the repo with a very minimal set of files. This is just enough to set out a basic outline. Hopefully as we move forward we&#39;ll be replacing many of these parts, but this is just something basic to get things started. This tree isn&#39;t really usable yet, as it doesn&#39;t yet have an easy way to obtain a compiler-rt/libgcc build.
6 years ago
#
Don&#39;t create dummy libs for libc++/libc++abi (#68) My understanding is that these dummy libs represent libraries who&#39;s contents, under musl, live in libc itself rather than being split out into separate libs. libc++/libc++abi are not provided my musl so doesn&#39;t make sense to pretend that we provide them.
6 years ago
for name in m rt pthread crypt util xnet resolv dl; do \
`WASM_AR` -&gt; `AR` to use standardized env var Progress towards #269
3 years ago
$(AR) crs "$(SYSROOT_LIB)/lib$${name}.a"; \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
done
Add a malloc implementation using dlmalloc.
6 years ago
Add build flag to select malloc implementation Add a build flag MALLOC_IMPL that can be set to dlmalloc or none (defaulting to dlmalloc) which controls the malloc implementation to use. The dlmalloc option is the same as before, but selecting none removes dlmalloc from the libc build. This flag replaces the BUILD_DLMALLOC flag, which never worked and thus can be removed without breaking any builds. By switching to MALLOC_IMPL, there is a clear path towards a different heap implementation, such as mimalloc.
3 years ago
#
# The build succeeded! The generated sysroot is in $(SYSROOT).
#
# The check for defined and undefined symbols expects there to be a heap
# alloctor (providing malloc, calloc, free, etc). Skip this step if the build
# is done without a malloc implementation.
ifneq ($(MALLOC_IMPL),none)
finish: check-symbols
endif
Pull out `{UN,}DEFINED_SYMBOLS` as make vars If the Apple bug is in make and not bash, maybe this will help.
3 years ago
DEFINED_SYMBOLS = $(SYSROOT_SHARE)/defined-symbols.txt
UNDEFINED_SYMBOLS = $(SYSROOT_SHARE)/undefined-symbols.txt
Add build flag to select malloc implementation Add a build flag MALLOC_IMPL that can be set to dlmalloc or none (defaulting to dlmalloc) which controls the malloc implementation to use. The dlmalloc option is the same as before, but selecting none removes dlmalloc from the libc build. This flag replaces the BUILD_DLMALLOC flag, which never worked and thus can be removed without breaking any builds. By switching to MALLOC_IMPL, there is a clear path towards a different heap implementation, such as mimalloc.
3 years ago
check-symbols: startup_files libc
Add a malloc implementation using dlmalloc.
6 years ago
#
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# Collect metadata on the sysroot and perform sanity checks.
Add a malloc implementation using dlmalloc.
6 years ago
#
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
mkdir -p "$(SYSROOT_SHARE)"
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
#
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# Collect symbol information.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
#
@# TODO: Use llvm-nm --extern-only instead of grep. This is blocked on
@# LLVM PR40497, which is fixed in 9.0, but not in 8.0.
@# Ignore certain llvm builtin symbols such as those starting with __mul
@# since these dependencies can vary between llvm versions.
`WASM_NM` -&gt; `NM` to use standardized env var Progress towards #269
3 years ago
"$(NM)" --defined-only "$(SYSROOT_LIB)"/libc.a "$(SYSROOT_LIB)"/libwasi-emulated-*.a "$(SYSROOT_LIB)"/*.o \
Remove duplicates from `defined-symbols.txt` (#314) In #311, it became apparent that duplicate symbol definitions were becoming unwieldy. This change merges all duplicates using `uniq`.
2 years ago
|grep ' [[:upper:]] ' |sed 's/.* [[:upper:]] //' |LC_ALL=C sort |uniq > "$(DEFINED_SYMBOLS)"
`WASM_NM` -&gt; `NM` to use standardized env var Progress towards #269
3 years ago
for undef_sym in $$("$(NM)" --undefined-only "$(SYSROOT_LIB)"/libc.a "$(SYSROOT_LIB)"/libc-*.a "$(SYSROOT_LIB)"/*.o \
build: use LC_ALL=C for sorting LC_COLLATE doesn&#39;t seem to work with all `sort`s
6 years ago
|grep ' U ' |sed 's/.* U //' |LC_ALL=C sort |uniq); do \
Pull out `{UN,}DEFINED_SYMBOLS` as make vars If the Apple bug is in make and not bash, maybe this will help.
3 years ago
grep -q '\<'$$undef_sym'\>' "$(DEFINED_SYMBOLS)" || echo $$undef_sym; \
done | grep -v "^__mul" > "$(UNDEFINED_SYMBOLS)"
grep '^_*imported_wasi_' "$(UNDEFINED_SYMBOLS)" \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
> "$(SYSROOT_LIB)/libc.imports"
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
#
Exclude C++ headers from the generated include-all.c program. The order that things happen in appears to have changed, and the include-all.c script is now generated at a time when there can be C++ headers in the sysroot, so adjust the script to exclude C++ headers.
3 years ago
# Generate a test file that includes all public C header files.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
#
Simplify a header check by using the `SYSROOT_*` variables
3 years ago
cd "$(SYSROOT_INC)" && \
Exclude C++ headers from the generated include-all.c program. The order that things happen in appears to have changed, and the include-all.c script is now generated at a time when there can be C++ headers in the sysroot, so adjust the script to exclude C++ headers.
3 years ago
for header in $$(find . -type f -not -name mman.h -not -name signal.h -not -name times.h -not -name resource.h |grep -v /bits/ |grep -v /c++/); do \
Simplify a header check by using the `SYSROOT_*` variables
3 years ago
echo '#include <'$$header'>' | sed 's/\.\///' ; \
done |LC_ALL=C sort >$(SYSROOT_SHARE)/include-all.c ; \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
cd - >/dev/null
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
#
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
# Test that it compiles.
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
#
`WASM_CC` -&gt; `CC` to use standardized env var Progress towards #269
3 years ago
$(CC) $(CFLAGS) -fsyntax-only "$(SYSROOT_SHARE)/include-all.c" -Wno-\#warnings
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Fix predefined macros check after recent clang change This is an alternative to #75.
5 years ago
#
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
# Collect all the predefined macros, except for compiler version macros
# which we don't need to track here.
Fix predefined macros check after recent clang change This is an alternative to #75.
5 years ago
#
Makefile refactoring; NFC (#186) * Use ?= for variables intended to be overridable. * Use `override` consistently for variables not meant to be overridden. * Omit miscellaneous comments from the build output. * Tidy up some comments. * Use `addprefix` to factor out a common prefix. * Add a comment. * Reorganize. * Adjust indentation. * Simplify the logic for the `check` rule. * Remove the `override` keywords. They theoretically protect what the Makefile considers to be implementation details from being overridden on the command-line, but in practice this isn&#39;t super important, and they add a lot of clutter. * Put source file names on their own lines.
5 years ago
@#
@# For the __*_ATOMIC_*_LOCK_FREE macros, squash individual compiler names
@# to attempt, toward keeping these files compiler-independent.
@#
@# We have to add `-isystem $(SYSROOT_INC)` because otherwise clang puts
@# its builtin include path first, which produces compiler-specific
@# output.
@#
@# TODO: Undefine __FLOAT128__ for now since it's not in clang 8.0.
@# TODO: Filter out __FLT16_* for now, as not all versions of clang have these.
Adjust the Makefile for LLVM 14
3 years ago
@# TODO: Filter out __NO_MATH_ERRNO_ and a few __*WIDTH__ that are new to clang 14.
Adjust the Makefile for LLVM 15 as of 2022-04-20
3 years ago
@# TODO: clang defined __FLT_EVAL_METHOD__ until clang 15, so we force-undefine it
@# for older versions.
`WASM_CC` -&gt; `CC` to use standardized env var Progress towards #269
3 years ago
$(CC) $(CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \
Fix predefined macros check after recent clang change This is an alternative to #75.
5 years ago
-isystem $(SYSROOT_INC) \
Fix -std=gnu17 when generating predefined_macros.txt (#187) * Fix -std=gnu11 when generating predefined_macros.txt The default recently changed in upstream clang: https://reviews.llvm.org/D75383 We want to be immune to such things when generating this list so that we can build wasi-libc with any recent clang version. * 17
5 years ago
-std=gnu17 \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
-E -dM -Wno-\#warnings \
Define _ALL_SOURCE when generating predefined-macros.txt. And clean up various stale declarations and macros that this turned up. In particular: - Don&#39;t install pthread.h or aio.h in THREAD_MODEL=single mode. - Don&#39;t define mkstemp and friends, since WASI currently has no support for temporary directories.
6 years ago
-D_ALL_SOURCE \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
-U__llvm__ \
-U__clang__ \
-U__clang_major__ \
-U__clang_minor__ \
-U__clang_patchlevel__ \
-U__clang_version__ \
Adjust the Makefile for LLVM 13
3 years ago
-U__clang_literal_encoding__ \
-U__clang_wide_literal_encoding__ \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
-U__GNUC__ \
-U__GNUC_MINOR__ \
-U__GNUC_PATCHLEVEL__ \
-U__VERSION__ \
-U__FLOAT128__ \
Adjust the Makefile for LLVM 14
3 years ago
-U__NO_MATH_ERRNO__ \
-U__BITINT_MAXWIDTH__ \
Adjust the Makefile for LLVM 15 as of 2022-04-20
3 years ago
-U__FLT_EVAL_METHOD__ -Wno-builtin-macro-redefined \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
| sed -e 's/__[[:upper:][:digit:]]*_ATOMIC_\([[:upper:][:digit:]_]*\)_LOCK_FREE/__compiler_ATOMIC_\1_LOCK_FREE/' \
Filter out __FLT16_* macros from predefined-macros.txt. Whether these are defined or not depends on the version of clang in use, and they&#39;re not that important at this time, so for now just ignore them for the purposes of this testing output.
6 years ago
| grep -v '^#define __FLT16_' \
Adjust the Makefile for LLVM 14
3 years ago
| grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
> "$(SYSROOT_SHARE)/predefined-macros.txt"
# Check that the computed metadata matches the expected metadata.
Add Azure Pipelines definition (#78)
5 years ago
# This ignores whitespace because on Windows the output has CRLF line endings.
Fix `make THREAD_MODEL=posix` (#311) * Fixes for the THREAD_MODEL=posix build * Fix expected symbols from previous commit * Enable `lock` in `random.c` when threads are enabled This uses the `_REENTRANT` definition to indicate when the `lock` should be available. * Disable `aio.h` when compiling for threads In talking to @sunfishcode about `aio.h`, this functionality is not yet a primary concern (it was already disabled in the default, single-threaded mode). Additionally, this change adds expectation lines for the new symbols/includes added and removed by `pthread.h`. This change was reached by running: ```console $ git diff --no-index expected/wasm32-wasi sysroot/share/wasm32-wasi &gt; patch.diff # replace &#34;sysroot/share&#34; with &#34;expected&#34; in `patch.diff` $ git apply patch.diff --reject # manually fix any rejections ``` * Specify the TLS model until LLVM 15 is released The `-ftls-model` configuration can be removed once https://reviews.llvm.org/D130053 makes its way into an upstream release. * Rename `__wasi_libc_pthread_self` to `__wasilibc_pthread_self` The symbol is still undefined, though. * Add different sets of expected output based on THREAD_MODEL * Re-add trailing whitespace to `predefined-macros.txt` @sbc100 wanted to retain the whitespace trailing after certain predefined macro lines. This change restores that whitespace from upstream and re-generates the POSIX version using the following command: ```console $ git diff --no-index expected/wasm32-wasi/posix/predefined-macros.txt sysroot/share/wasm32-wasi/predefined-macros.txt | sed &#39;s/sysroot\/share\/wasm32-wasi/expected\/wasm32-wasi\/posix/&#39; | git apply ``` * Protect `preopens.c` against concurrent access * Only build thread-capable wasi-libc on latest version of Clang * Use `thrd_sleep` from MUSL instead of aliasing `nanosleep` * Define `pthread_setcancelstate` in `THREAD_MODEL=posix` builds There are other options here (e.g., always define the `pthread_*` symbols with stubs) but until we discuss that this is an intermediate working step. * Define a Wasm global to store `pthread_self` * Remove `g_needs_dynamic_alloc` global * Document the state of pthread support * review: de-duplicate symbols based on #314 * review: only define `__wasilibc_cwd_{un}lock` when needed * review: add #ifdefs to `__pthread_setcancelstate` * review: add additional #ifdefs to `pthread_self.c` * review: put lock definition behind #ifdef _REENTRANT * review: remove pthread_setcancelstate.c * review: re-fix indentation * review: alias __clock_nanosleep in bottom half * review: remove extra line Co-authored-by: Sam Clegg &lt;sbc@chromium.org&gt;
2 years ago
diff -wur "$(CURDIR)/expected/$(MULTIARCH_TRIPLE)/$(THREAD_MODEL)" "$(SYSROOT_SHARE)"
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
Makefile: Don&#39;t mix phony targets with directory names Remove build rules for $(SYSROOT) and $(SYSROOT_INC). The latter becomes `include_dirs`. The former is not needed, instead just add startup_files to the finish rule.
6 years ago
install: finish
WASI libc prototype implementation. This incoporates pieces from musl-libc, cloudlibc, cloudabi, libpreopen, and dlmalloc, as well as a significant amount of new code.
6 years ago
mkdir -p "$(INSTALL_DIR)"
cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"
Add `make clean` rule, don&#39;t have `include_dirs` nuke other things (#277) I think this separation of concerns is good, though I don&#39;t need it for Nixpkgs.
3 years ago
clean:
$(RM) -r "$(OBJDIR)"
$(RM) -r "$(SYSROOT)"
.PHONY: default startup_files libc finish install include_dirs clean