Vulkan: Disable global merge for volk

This optimization pass breaks the build by exporting volk's internal binding symbols from libGLESv2.so. Since the test binary also links volk, this causes a SEGV as the wrong (uninitialized) function pointer is called. This is an LLVM bug and will be fixed upstream: https://reviews.llvm.org/D73235 Bug: angleproject:4351 Change-Id: Iebe0eabd975f8109231df30eef8c9074af8190e9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2023910Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Michael Spang <spang@chromium.org>

Vulkan: Disable global merge for volk
bab2b3de · Michael Spang · Commit Bot · b630bf9e · bab2b3de
Commit bab2b3de authored Jan 22, 2020 by Michael Spang Committed by Commit Bot Jan 29, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 1 deletion

BUILD.gn src/third_party/volk/BUILD.gn +16 -1

No files found.
--- a/src/third_party/volk/BUILD.gn
+++ b/src/third_party/volk/BUILD.gn
@@ -6,12 +6,27 @@ config("volk_config") {
  include_dirs = [ "." ]
 }

+# TODO(anglebug.com/4351): Remove this after clang rolls.
+config("volk_internal_config") {
+  if (is_clang) {
+    cflags = [
+      "-Xclang",
+      "-mllvm",
+      "-Xclang",
+      "--enable-global-merge=false",
+    ]
+  }
+}
+
 source_set("volk") {
  sources = [
    "volk.c",
    "volk.h",
  ]
-  public_configs = [ ":volk_config" ]
+  public_configs = [
+    ":volk_config",
+    ":volk_internal_config",
+  ]
  public_deps = [
    "../../../third_party/vulkan-headers/src:vulkan_headers",
  ]