[llvm] 4d55f0b - [gn] attempt to port 53a81d4d26f0 more (win/asan dynamic runtime)

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2024-09-10T09:20:04-04:00
New Revision: 4d55f0bf254517cfbdd1acb4297a9f9ff5c12303

URL: https://github.com/llvm/llvm-project/commit/4d55f0bf254517cfbdd1acb4297a9f9ff5c12303
DIFF: https://github.com/llvm/llvm-project/commit/4d55f0bf254517cfbdd1acb4297a9f9ff5c12303.diff

LOG: [gn] attempt to port 53a81d4d26f0 more (win/asan dynamic runtime)

Added: 
    

Modified: 
    llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
index c4d7c2f08e6353..cf308753f0c825 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
@@ -67,6 +67,8 @@ if (current_toolchain == host_toolchain) {
     cflags = []
     if (target_os != "win") {
       cflags += [ "-ftls-model=initial-exec" ]
+    } else {
+      ldflags = [ "/OPT:NOICF" ]
     }
 
     # FIXME: link rt dl m pthread log
@@ -175,13 +177,6 @@ if (current_toolchain == host_toolchain) {
       "//compiler-rt/lib/ubsan:cxx_sources",
       "//compiler-rt/lib/ubsan:sources",
     ]
-    if (current_os == "win") {
-      deps += [
-        ":weak_interception",
-        "//compiler-rt/lib/sanitizer_common:weak_interception",
-        "//compiler-rt/lib/ubsan:weak_interception",
-      ]
-    }
     defines = [ "ASAN_DYNAMIC" ]
     if (current_os == "win") {
       defines += [ "INTERCEPTION_DYNAMIC_CRT" ]