Skip to content
This repository has been archived by the owner on Aug 10, 2021. It is now read-only.

Update to XCode 11. #3375

Merged
merged 33 commits into from
Sep 27, 2019
Merged

Update to XCode 11. #3375

merged 33 commits into from
Sep 27, 2019

Conversation

olonho
Copy link
Contributor

@olonho olonho commented Sep 23, 2019

No description provided.

@@ -47,6 +60,8 @@ excludedFunctions.mingw = LLVMDumpType

excludedFunctions = LLVMInitializeAllAsmParsers LLVMInitializeAllAsmPrinters LLVMInitializeAllDisassemblers \
LLVMInitializeAllTargetInfos LLVMInitializeAllTargetMCs LLVMInitializeAllTargets LLVMInitializeNativeTarget \
LLVMInitializeNativeAsmParser LLVMInitializeNativeAsmPrinter LLVMInitializeNativeDisassembler
LLVMInitializeNativeAsmParser LLVMInitializeNativeAsmPrinter LLVMInitializeNativeDisassembler \
LLVMInitializeNativeAsmParser LLVMInitializeNativeAsmPrinter LLVMInitializeNativeDisassembler \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These ones excluded twice?

@@ -303,11 +303,12 @@ uint32_t inPages(uint32_t value) {
extern "C" void Konan_notify_memory_grow();

uint32_t memorySize() {
return __builtin_wasm_current_memory();
// return __builtin_wasm_current_memory();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented code.

}

int32_t growMemory(uint32_t delta) {
int32_t oldLength = __builtin_wasm_grow_memory(delta);
int32_t oldLength = __builtin_wasm_memory_grow(0, delta); // __builtin_wasm_grow_memory(delta);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented code.

@@ -297,8 +297,8 @@ internal class Llvm(val context: Context, val llvmModule: LLVMModuleRef) {
}

private fun importMemset(): LLVMValueRef {
val parameterTypes = cValuesOf(int8TypePtr, int8Type, int32Type, int32Type, int1Type)
val functionType = LLVMFunctionType(LLVMVoidType(), parameterTypes, 5, 0)
val parameterTypes = cValuesOf(int8TypePtr, int8Type, int32Type, int1Type)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

memset was likely changed in llvm/llvm-project@1e68724
The commit message states that alignment should now be specified with an attribute.
We should ensure that proper alignment is applied for our memset usages.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fortunately we pointer align object slots where it's used, so likely not a big problem for us.

@@ -125,6 +124,10 @@ internal inline fun<R> generateFunction(codegen: CodeGenerator,
startLocation,
endLocation,
function), code)

// To perform per-function validation.
if (false)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We definitely need a handle (CLI flag?) for that. But it can be added in a separate PR.

@@ -173,6 +173,7 @@ open class FrameworkTest : DefaultTask() {
}

val args = listOf("--sdk", sdk, "-v", "-t", ldPath, frameworkBinary)
println("would run '$bitcodeBuildTool' with '$args")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leftover.

@msink
Copy link
Contributor

msink commented Sep 27, 2019

On windows:
mingw-w64-x86_64-libiconv not installed in msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
copied manually from 6.0.1 - gradlew bundle and samples/tetris works.

@sbogolepov
Copy link
Contributor

msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 was re-uploaded with libiconv.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants