[compiler-rt] f1561b5 - [NFC][sanitizer] Rename definition

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2023-08-14T14:27:18-07:00
New Revision: f1561b59b108f6e16de1ba8a62e7562b96852082

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

LOG: [NFC][sanitizer] Rename definition

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_redefine_builtins.h
    compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_redefine_builtins.h b/compiler-rt/lib/sanitizer_common/sanitizer_redefine_builtins.h
index b8f6c5b62b70c4..d24b179ef320c1 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_redefine_builtins.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_redefine_builtins.h
@@ -22,7 +22,7 @@ asm("memmove = __sanitizer_internal_memmove");
 asm("memset = __sanitizer_internal_memset");
 
 #      if defined(__cplusplus) && \
-          !defined(SANITIZER_COMMON_REDEFINE_BUILTINS_IN_CXX)
+          !defined(SANITIZER_COMMON_REDEFINE_BUILTINS_IN_STD)
 
 // The builtins should not be redefined in source files that make use of C++
 // standard libraries, in particular where C++STL headers with inline functions

diff  --git a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh
index 7ec7c8ac87760c..b332d2f4862f25 100755
--- a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh
+++ b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh
@@ -78,7 +78,7 @@ if [[ "$FLAGS" =~ "-m32" ]] ; then
   FLAGS+=" -U_FILE_OFFSET_BITS"
 fi
 FLAGS+=" -fPIC -flto -Oz -g0 -DNDEBUG -target $TARGET_TRIPLE -Wno-unused-command-line-argument"
-FLAGS+=" -include ${SRC_DIR}/../sanitizer_redefine_builtins.h -DSANITIZER_COMMON_REDEFINE_BUILTINS_IN_CXX"
+FLAGS+=" -include ${SRC_DIR}/../sanitizer_redefine_builtins.h -DSANITIZER_COMMON_REDEFINE_BUILTINS_IN_STD"
 
 LINKFLAGS="-fuse-ld=lld -target $TARGET_TRIPLE"