Skip to content

S
swiftshader
Commit 2be25f08 by Nicolas Capens Committed by Nicolas Capens
Options

Temporarily support both ORCv1 and ORCv2

LLVM's ORCv2 JIT API, used by the LLVMJIT.cpp file, is causing some issues for Fuchsia and potentially some Android build. Temporarily bring back the ORCv1 version of LLVMJIT to unblock them. Bug: b/171897980 Bug: chromium:1140854 Change-Id: I3465bba20fe36fb9d276acfa993e3593ef10a07d Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/49688Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com>
parent c1839ee3
Showing with 3 additions and 3 deletions
src/Android.bp
...@@ -194,7 +194,7 @@ cc_defaults { ...@@ -194,7 +194,7 @@ cc_defaults {
"Reactor/Debug.cpp", "Reactor/Debug.cpp",
"Reactor/EmulatedIntrinsics.cpp", "Reactor/EmulatedIntrinsics.cpp",
"Reactor/ExecutableMemory.cpp", "Reactor/ExecutableMemory.cpp",
"Reactor/LLVMJIT.cpp", "Reactor/LLVMJIT_ORCv1.cpp", // TODO(b/171897980): Upgrade to ORCv2
"Reactor/LLVMReactor.cpp", "Reactor/LLVMReactor.cpp",
"Reactor/OptimalIntrinsics.cpp", "Reactor/OptimalIntrinsics.cpp",
"Reactor/Reactor.cpp", "Reactor/Reactor.cpp",
...@@ -226,7 +226,7 @@ cc_defaults { ...@@ -226,7 +226,7 @@ cc_defaults {
"Reactor/Debug.cpp", "Reactor/Debug.cpp",
"Reactor/EmulatedIntrinsics.cpp", "Reactor/EmulatedIntrinsics.cpp",
"Reactor/ExecutableMemory.cpp", "Reactor/ExecutableMemory.cpp",
"Reactor/LLVMJIT.cpp", "Reactor/LLVMJIT_ORCv1.cpp", // TODO(b/171897980): Upgrade to ORCv2
"Reactor/LLVMReactor.cpp", "Reactor/LLVMReactor.cpp",
"Reactor/OptimalIntrinsics.cpp", "Reactor/OptimalIntrinsics.cpp",
"Reactor/Reactor.cpp", "Reactor/Reactor.cpp",
......
src/Reactor/BUILD.gn
...@@ -329,7 +329,7 @@ if (supports_llvm) { ...@@ -329,7 +329,7 @@ if (supports_llvm) {
sources = [ sources = [
"CPUID.cpp", "CPUID.cpp",
"LLVMJIT.cpp", "LLVMJIT_ORCv1.cpp", # TODO(b/171897980): Upgrade to ORCv2
"LLVMReactor.cpp", "LLVMReactor.cpp",
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment