[compiler-rt] [compiler-rt] freadlink fix 2 for #83679. (PR #110372)
David CARLIER via llvm-commits
llvm-commits at lists.llvm.org
Sat Sep 28 09:09:25 PDT 2024
https://github.com/devnexen updated https://github.com/llvm/llvm-project/pull/110372
>From f9a4089d63ef4f33c7ad40b002fea81e7d779511 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen at gmail.com>
Date: Sat, 28 Sep 2024 17:03:23 +0100
Subject: [PATCH] [compiler-rt] freadlink fix 2 for #83679.
using __MAC_OS_X_VERSION_MIN_REQUIRED instead.
---
.../sanitizer_common/sanitizer_platform_interceptors.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
index d4cc380f641b82..e7d2966f10055b 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -606,13 +606,12 @@
// FIXME: also available from musl 1.2.5
#define SANITIZER_INTERCEPT_PREADV2 (SI_LINUX && __GLIBC_PREREQ(2, 26))
#define SANITIZER_INTERCEPT_PWRITEV2 (SI_LINUX && __GLIBC_PREREQ(2, 26))
-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
- __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 130000
-# define SI_MAC_DEPLOYMENT_BELOW_13_00 1
+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000
+# define SI_MAC_OS_DEPLOYMENT_MIN_13_00 1
#else
-# define SI_MAC_DEPLOYMENT_BELOW_13_00 0
+# define SI_MAC_OS_DEPLOYMENT_MIN_13_00 0
#endif
-#define SANITIZER_INTERCEPT_FREADLINK (SI_MAC && !SI_MAC_DEPLOYMENT_BELOW_13_00)
+#define SANITIZER_INTERCEPT_FREADLINK (SI_MAC && SI_MAC_OS_DEPLOYMENT_MIN_13_00)
// This macro gives a way for downstream users to override the above
// interceptor macros irrespective of the platform they are on. They have
More information about the llvm-commits
mailing list