-
Notifications
You must be signed in to change notification settings - Fork 1.1k
build: Repair the build on WASI platform (take 3) #5057
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
kateinoigakukun
merged 12 commits into
swiftlang:main
from
kateinoigakukun:yt/repair-wasi-build
Aug 9, 2024
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
3506f58
[CMake] Use LIBXML2_INCLUDE_DIR instead of hardcoding /usr/include/li…
kateinoigakukun fef1083
[CMake] Disable libdispatch & threads, enable some emulations on WASI
kateinoigakukun 27310f4
[CMake] Exclude FoundationNetworking and _CFURLSessionInterface on WASI
kateinoigakukun 164af81
[wasm] Include CFPreferences.h, CFRunLoop.h, and CFStream.h in WASI b…
kateinoigakukun f91a759
[wasm] Fix the new CFString.c compilation error on WASI
kateinoigakukun 27efb0c
[wasm] Build the vendored version of BlocksRuntime on WASI
kateinoigakukun f0a3631
[wasm] `strlcpy` and `strlcat` are available in wasi-libc
kateinoigakukun 8176d11
[Build] Repair WASI build with SwiftPM
kateinoigakukun e5104c3
Use `__builtin_return_address` instead of `__builtin_frame_address`
kateinoigakukun a1b9c39
[CMake] Not even try to find libdispatch on WASI
kateinoigakukun 965246e
[CMake] Build BlocksRuntime as object library
kateinoigakukun 3b8485a
[CMake] Remove POSITION_INDEPENDENT_CODE=FALSE from BlocksRuntime
kateinoigakukun 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
##===----------------------------------------------------------------------===## | ||
## | ||
## This source file is part of the Swift open source project | ||
## | ||
## Copyright (c) 2024 Apple Inc. and the Swift project authors | ||
## Licensed under Apache License v2.0 | ||
## | ||
## See LICENSE.txt for license information | ||
## See CONTRIBUTORS.md for the list of Swift project authors | ||
## | ||
## SPDX-License-Identifier: Apache-2.0 | ||
## | ||
##===----------------------------------------------------------------------===## | ||
|
||
# Build the vendored version of the BlocksRuntime library, which is used by | ||
# platforms that don't support libdispatch. | ||
|
||
# Build the BlocksRuntime as an object library, shipped as a part | ||
# of libCoreFoundation. | ||
add_library(BlocksRuntime OBJECT | ||
data.c | ||
runtime.c) | ||
|
||
target_include_directories(BlocksRuntime PUBLIC | ||
${CMAKE_CURRENT_SOURCE_DIR}/include | ||
jmschonfeld marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# For CFTargetConditionals.h | ||
${CMAKE_CURRENT_SOURCE_DIR}/../include) | ||
jmschonfeld marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS BlocksRuntime) |
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 |
---|---|---|
|
@@ -600,7 +600,7 @@ CFBundleRef CFBundleGetBundleWithIdentifier(CFStringRef bundleID) { | |
#if TARGET_OS_WASI | ||
hint = NULL; | ||
#else | ||
hint = __builtin_frame_address(0); | ||
hint = __builtin_return_address(0); | ||
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. It was accidentally changed in #5052 We should continue using |
||
#endif | ||
return _CFBundleGetBundleWithIdentifier(bundleID, hint); | ||
} | ||
|
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
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.
Uh oh!
There was an error while loading. Please reload this page.