-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[WebAssembly] enable shims and stubs for WASI #29505
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,7 @@ | |
#define NOMINMAX | ||
#include <windows.h> | ||
#else | ||
#if !defined(__HAIKU__) | ||
#if !defined(__HAIKU__) && !defined(__wasi__) | ||
#include <sys/errno.h> | ||
#else | ||
#include <errno.h> | ||
|
@@ -67,7 +67,7 @@ static float swift_strtof_l(const char *nptr, char **endptr, locale_t loc) { | |
#define strtod_l swift_strtod_l | ||
#define strtof_l swift_strtof_l | ||
#endif | ||
#elif defined(__linux__) | ||
#elif defined(__linux__) || defined(__wasi__) | ||
#include <locale.h> | ||
#else | ||
#include <xlocale.h> | ||
|
@@ -503,6 +503,8 @@ const char *swift::_swift_stdlib_strtof_clocale( | |
void swift::_swift_stdlib_flockfile_stdout() { | ||
#if defined(_WIN32) | ||
_lock_file(stdout); | ||
#elif defined(__wasi__) | ||
// WebAssembly/WASI doesn't support file locking yet | ||
#else | ||
flockfile(stdout); | ||
#endif | ||
|
@@ -511,6 +513,8 @@ void swift::_swift_stdlib_flockfile_stdout() { | |
void swift::_swift_stdlib_funlockfile_stdout() { | ||
#if defined(_WIN32) | ||
_unlock_file(stdout); | ||
#elif defined(__wasi__) | ||
// WebAssembly/WASI doesn't support file locking yet | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please create a JIRA issue for supporting threading/locking on WASI and reference it here. |
||
#else | ||
funlockfile(stdout); | ||
#endif | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just make this unconditional. This is inside the implementation, so it is fine.