Skip to content

S
swiftshader
Commit 0c60dc5c by Antonio Maiorano
Options

Use LLVM 10 instead of 7 for GN builds

Created a BUILD.gn file for llvm-10.0, and validated that chromium builds for x64, as well as for Fuchsia x64 and arm64. Note that as far as we know, only Fuchsia is currently using the LLVM backend for Reactor for arm64 builds; normal Chromium builds use the Subzero backend. Bug: b/152339534 Change-Id: Iff344c96fb26e82ed1757da29118cf5529255a80 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46488 Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarAntonio Maiorano <amaiorano@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent e8dd233c
Showing with 9 additions and 9 deletions
src/Reactor/BUILD.gn
...@@ -322,11 +322,11 @@ if (use_swiftshader_with_subzero) { ...@@ -322,11 +322,11 @@ if (use_swiftshader_with_subzero) {
if (supports_llvm) { if (supports_llvm) {
swiftshader_source_set("swiftshader_llvm_reactor") { swiftshader_source_set("swiftshader_llvm_reactor") {
llvm7_dir = "../../third_party/llvm-7.0" llvm_dir = "../../third_party/llvm-10.0"
deps = [ deps = [
":swiftshader_reactor_base", ":swiftshader_reactor_base",
"$llvm7_dir:swiftshader_llvm", "$llvm_dir:swiftshader_llvm",
] ]
sources = [ sources = [
...@@ -338,20 +338,20 @@ if (supports_llvm) { ...@@ -338,20 +338,20 @@ if (supports_llvm) {
configs = [ ":swiftshader_reactor_private_config" ] configs = [ ":swiftshader_reactor_private_config" ]
include_dirs = [ include_dirs = [
"$llvm7_dir/llvm/include/", "$llvm_dir/llvm/include/",
"$llvm7_dir/configs/common/include/", "$llvm_dir/configs/common/include/",
] ]
if (is_linux) { if (is_linux) {
include_dirs += [ "$llvm7_dir/configs/linux/include/" ] include_dirs += [ "$llvm_dir/configs/linux/include/" ]
} else if (is_fuchsia) { } else if (is_fuchsia) {
include_dirs += [ "$llvm7_dir/configs/fuchsia/include/" ] include_dirs += [ "$llvm_dir/configs/fuchsia/include/" ]
} else if (is_win) { } else if (is_win) {
include_dirs += [ "$llvm7_dir/configs/windows/include/" ] include_dirs += [ "$llvm_dir/configs/windows/include/" ]
} else if (is_android) { } else if (is_android) {
include_dirs += [ "$llvm7_dir/configs/android/include/" ] include_dirs += [ "$llvm_dir/configs/android/include/" ]
} else if (is_mac) { } else if (is_mac) {
include_dirs += [ "$llvm7_dir/configs/darwin/include/" ] include_dirs += [ "$llvm_dir/configs/darwin/include/" ]
} else { } else {
assert(false, "llvm-7.0 not configured for target platform") assert(false, "llvm-7.0 not configured for target platform")
} }
......
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