From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1665) id 531973858D38; Sat, 18 Nov 2023 08:49:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 531973858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1700297398; bh=aDBmjhKSsYRjHcUn4bGarmquC+fTBf8oIuFzL2iRsT4=; h=From:To:Subject:Date:From; b=DIwVhqNUH34MuBp5gB1ESEGFFjN87IGZ0XEd7PNwZLrXMprBAlX0QHWOCvDbIjpw0 CTQRqHlgiWeC3MrktM/ln197JFXXrnu8KTNyYUnhUfTBiBHqTIWnlaA+yfPd9zQqM9 1DDUeOU6csiJyFAlnii6U1+gd41i0AVjcDtzAHxU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: =?utf-8?q?Fran=C3=A7ois-Xavier_Coudert?= To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-5571] libsanitizer: fix build on darwin X-Act-Checkin: gcc X-Git-Author: Francois-Xavier Coudert X-Git-Refname: refs/heads/master X-Git-Oldrev: 26ab97e0da5d99c23654d90428d26e22ef976309 X-Git-Newrev: c2553dd3891efc928a85d4852f1b69afed9c6325 Message-Id: <20231118084958.531973858D38@sourceware.org> Date: Sat, 18 Nov 2023 08:49:58 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c2553dd3891efc928a85d4852f1b69afed9c6325 commit r14-5571-gc2553dd3891efc928a85d4852f1b69afed9c6325 Author: Francois-Xavier Coudert Date: Fri Nov 17 12:46:09 2023 +0100 libsanitizer: fix build on darwin Upstream report of the issue at https://github.com/llvm/llvm-project/issues/72639 libsanitizer/ChangeLog: * asan/asan_mac.cpp: Protect Apple blocks behind the MISSING_BLOCKS_SUPPORT macro. Diff: --- libsanitizer/asan/asan_mac.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libsanitizer/asan/asan_mac.cpp b/libsanitizer/asan/asan_mac.cpp index 5d5146e0cde..6252fa20d5e 100644 --- a/libsanitizer/asan/asan_mac.cpp +++ b/libsanitizer/asan/asan_mac.cpp @@ -139,9 +139,11 @@ typedef void (*dispatch_mach_handler_function_t)(void *context, dispatch_mach_reason reason, dispatch_mach_msg_t message, mach_error_t error); +#if !defined(MISSING_BLOCKS_SUPPORT) typedef void (^dispatch_mach_handler_t)(dispatch_mach_reason reason, dispatch_mach_msg_t message, mach_error_t error); +#endif // A wrapper for the ObjC blocks used to support libdispatch. typedef struct {