summaryrefslogtreecommitdiffstats
path: root/compiler-rt
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2017-07-06 21:51:32 +0000
committerReid Kleckner <rnk@google.com>2017-07-06 21:51:32 +0000
commitda565bc97c0b4354079ede75d766848bdf933bdb (patch)
tree4ed046430e5bf0cf540e21f4ad3361f6dde034e9 /compiler-rt
parentd4053fb2ec41bb91e5b1717fb13ec739086190f3 (diff)
downloadbcm5719-llvm-da565bc97c0b4354079ede75d766848bdf933bdb.tar.gz
bcm5719-llvm-da565bc97c0b4354079ede75d766848bdf933bdb.zip
[asan] Fix -Winvalid-paste error with clang-cl
We don't need to paste tokens here. String literal concatenation works just fine here with MSVC and Clang. llvm-svn: 307321
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/lib/asan/asan_new_delete.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/asan_new_delete.cc b/compiler-rt/lib/asan/asan_new_delete.cc
index 942b169d920..e68c7f3e240 100644
--- a/compiler-rt/lib/asan/asan_new_delete.cc
+++ b/compiler-rt/lib/asan/asan_new_delete.cc
@@ -26,7 +26,7 @@
// VS2015 dynamic CRT (MD) work.
#if SANITIZER_WINDOWS
#define CXX_OPERATOR_ATTRIBUTE
-#define COMMENT_EXPORT(sym) __pragma(comment(linker, "/export:"##sym))
+#define COMMENT_EXPORT(sym) __pragma(comment(linker, "/export:" sym))
#ifdef _WIN64
COMMENT_EXPORT("??2@YAPEAX_K@Z") // operator new
COMMENT_EXPORT("??2@YAPEAX_KAEBUnothrow_t@std@@@Z") // operator new nothrow
OpenPOWER on IntegriCloud