Fix MSan annotations inclusion guard.

#cmakedefine does not behave the way I though it was.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175050 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake
index b2be7b4f072afabc1aaf0abc5502835530cc23ae..eda17ee4a62b5c76178ea73c8f88490f0a153e95 100644 (file)
--- a/include/llvm/Config/llvm-config.h.cmake
+++ b/include/llvm/Config/llvm-config.h.cmake
@@ -125,6 +125,6 @@
 #cmakedefine LLVM_VERSION_MINOR ${LLVM_VERSION_MINOR}
 
 /* Define to 1 if you have the <sanitizer/msan_interface.h> header file. */
-#cmakedefine LLVM_HAVE_MSAN_ANNOTATIONS ${HAVE_SANITIZER_MSAN_INTERFACE_H}
+#cmakedefine HAVE_SANITIZER_MSAN_INTERFACE_H ${HAVE_SANITIZER_MSAN_INTERFACE_H}
 
 #endif

diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h
index 92835fce542b25e2f59fe5eb18e040950b266ed4..adc0ce2ab14490d34fd6aea2fb45fcc3b34530a0 100644 (file)
--- a/include/llvm/Support/Compiler.h
+++ b/include/llvm/Support/Compiler.h
@@ -305,7 +305,7 @@
 # define LLVM_FUNCTION_NAME __func__
 #endif
 
-#if defined(LLVM_HAVE_MSAN_ANNOTATIONS)
+#if defined(HAVE_SANITIZER_MSAN_INTERFACE_H)
 # include <sanitizer/msan_interface.h>
 #else
 # define __msan_allocated_memory(p, size)