From dc4cc36019562a7c296ffa359673ce70fe4cc298 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Thu, 28 Dec 2017 23:06:24 +0000 Subject: [PATCH 2002/2002] Ignore the DISPATCH_NOESCAPE if not defined This macro is only defined after XCode 8, causing build breakage for build systems with prior versions. Ignore DISPATCH_NOESCAPE if not defined. Differential Revision: https://reviews.llvm.org/D41601 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@321543 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit b2e492beb7dee6983578da79ad2b79f102826ed2) --- lib/tsan/rtl/tsan_libdispatch_mac.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git llvm_release_50/projects/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc macports_release_50/projects/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc index 08b5af5c4..45faf9350 100644 --- llvm_release_50/projects/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc +++ macports_release_50/projects/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc @@ -25,6 +25,11 @@ #include #include +// DISPATCH_NOESCAPE is not defined prior to XCode 8. +#ifndef DISPATCH_NOESCAPE +#define DISPATCH_NOESCAPE +#endif + typedef long long_t; // NOLINT namespace __tsan { -- 2.18.0