[compiler-rt] [compiler-rt] Fix '-Wmacro-redefined' errors (PR #100337)
Dmitry Chestnykh via llvm-commits
llvm-commits at lists.llvm.org
Wed Jul 24 02:36:31 PDT 2024
https://github.com/chestnykh created https://github.com/llvm/llvm-project/pull/100337
https://lab.llvm.org/buildbot/#/builders/186/builds/880
>From d7935aebae205cd5649885c51a5e4d7a26beb5eb Mon Sep 17 00:00:00 2001
From: Dmitry Chestnykh <dm.chestnykh at gmail.com>
Date: Wed, 24 Jul 2024 12:36:36 +0300
Subject: [PATCH] [compiler-rt] Fix '-Wmacro-redefined' errors
---
compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
index bc2cb247f2a8a..bdc79778be631 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
@@ -2173,6 +2173,9 @@ static const char *RegNumToRegName(int reg) {
case REG_ESP:
return "esp";
# elif defined(__arm__)
+# ifdef MAKE_CASE
+# undef MAKE_CASE
+# endif
# define REG_STR(reg) #reg
# define MAKE_CASE(N) \
case REG_R##N: \
@@ -2197,6 +2200,9 @@ static const char *RegNumToRegName(int reg) {
case REG_R15:
return "pc";
# elif defined(__aarch64__)
+# ifdef MAKE_CASE
+# undef MAKE_CASE
+# endif
# define REG_STR(reg) #reg
# define MAKE_CASE(N) \
case N: \
@@ -2247,6 +2253,9 @@ static const char *RegNumToRegName(int reg) {
static uptr GetArmRegister(ucontext_t *ctx, int RegNum) {
switch (RegNum) {
# if defined(__arm__)
+# ifdef MAKE_CASE
+# undef MAKE_CASE
+# endif
# define MAKE_CASE(N) \
case REG_R##N: \
return ctx->uc_mcontext.arm_r##N
More information about the llvm-commits
mailing list