Skip to content

Commit f1baec3

Browse files
authored
Support SANITIZE_THREAD in llvm.mk (#42468)
1 parent 65eff6d commit f1baec3

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

deps/llvm-options.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ LLVM_FLAVOR := $(LLVM_BUILDTYPE)
1515
ifeq ($(LLVM_SANITIZE),1)
1616
ifeq ($(SANITIZE_MEMORY),1)
1717
LLVM_BUILDTYPE := $(LLVM_BUILDTYPE)+MSAN
18-
else
18+
endif
19+
ifeq ($(SANITIZE_ADDRESS),1)
1920
LLVM_BUILDTYPE := $(LLVM_BUILDTYPE)+ASAN
2021
endif
22+
ifeq ($(SANITIZE_THREAD),1)
23+
LLVM_BUILDTYPE := $(LLVM_BUILDTYPE)+TSAN
24+
endif
2125
endif
2226

2327

deps/llvm.mk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,19 @@ LLVM_CFLAGS += -fsanitize=memory -fsanitize-memory-track-origins
177177
LLVM_LDFLAGS += -fsanitize=memory -fsanitize-memory-track-origins
178178
LLVM_CXXFLAGS += -fsanitize=memory -fsanitize-memory-track-origins
179179
LLVM_CMAKE += -DLLVM_USE_SANITIZER="MemoryWithOrigins"
180-
else
180+
endif
181+
ifeq ($(SANITIZE_ADDRESS),1)
181182
LLVM_CFLAGS += -fsanitize=address
182183
LLVM_LDFLAGS += -fsanitize=address
183184
LLVM_CXXFLAGS += -fsanitize=address
184185
LLVM_CMAKE += -DLLVM_USE_SANITIZER="Address"
185186
endif
187+
ifeq ($(SANITIZE_THREAD),1)
188+
LLVM_CFLAGS += -fsanitize=thread
189+
LLVM_LDFLAGS += -fsanitize=thread
190+
LLVM_CXXFLAGS += -fsanitize=thread
191+
LLVM_CMAKE += -DLLVM_USE_SANITIZER="Thread"
192+
endif
186193
endif # LLVM_SANITIZE
187194

188195
ifeq ($(LLVM_LTO),1)

0 commit comments

Comments
 (0)