From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id CF90E3858031; Wed, 5 Jan 2022 22:06:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF90E3858031 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-10378] libstdc++: Make Asan detection work for Clang [PR103453] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: fa5e1ca4fde63c4d5f6323a2ecc23ed1389049e7 X-Git-Newrev: 37fec1c1b0c942d861dd51b31d099084826a485b Message-Id: <20220105220648.CF90E3858031@sourceware.org> Date: Wed, 5 Jan 2022 22:06:48 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jan 2022 22:06:48 -0000 https://gcc.gnu.org/g:37fec1c1b0c942d861dd51b31d099084826a485b commit r10-10378-g37fec1c1b0c942d861dd51b31d099084826a485b Author: Jonathan Wakely Date: Tue Nov 30 13:14:38 2021 +0000 libstdc++: Make Asan detection work for Clang [PR103453] Clang doesn't define __SANITIZE_ADDRESS__ so use its __has_feature check to detect Asan instead. libstdc++-v3/ChangeLog: PR libstdc++/103453 * config/allocator/malloc_allocator_base.h (_GLIBCXX_SANITIZE_STD_ALLOCATOR): Define for Clang. * config/allocator/new_allocator_base.h (_GLIBCXX_SANITIZE_STD_ALLOCATOR): Likewise. (cherry picked from commit cca6090b13ab503bef1cfa327e2d107789d6bd30) Diff: --- libstdc++-v3/config/allocator/malloc_allocator_base.h | 10 ++++++++-- libstdc++-v3/config/allocator/new_allocator_base.h | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/config/allocator/malloc_allocator_base.h b/libstdc++-v3/config/allocator/malloc_allocator_base.h index dbe7c761548..692e9d1124b 100644 --- a/libstdc++-v3/config/allocator/malloc_allocator_base.h +++ b/libstdc++-v3/config/allocator/malloc_allocator_base.h @@ -52,8 +52,14 @@ namespace std # define __allocator_base __gnu_cxx::malloc_allocator #endif -#if defined(__SANITIZE_ADDRESS__) && !defined(_GLIBCXX_SANITIZE_STD_ALLOCATOR) -# define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1 +#ifndef _GLIBCXX_SANITIZE_STD_ALLOCATOR +# if defined(__SANITIZE_ADDRESS__) +# define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1 +# elif defined __has_feature +# if __has_feature(address_sanitizer) +# define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1 +# endif +# endif #endif #endif diff --git a/libstdc++-v3/config/allocator/new_allocator_base.h b/libstdc++-v3/config/allocator/new_allocator_base.h index ea5425545e0..8e64b05a664 100644 --- a/libstdc++-v3/config/allocator/new_allocator_base.h +++ b/libstdc++-v3/config/allocator/new_allocator_base.h @@ -52,8 +52,14 @@ namespace std # define __allocator_base __gnu_cxx::new_allocator #endif -#if defined(__SANITIZE_ADDRESS__) && !defined(_GLIBCXX_SANITIZE_STD_ALLOCATOR) -# define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1 +#ifndef _GLIBCXX_SANITIZE_STD_ALLOCATOR +# if defined(__SANITIZE_ADDRESS__) +# define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1 +# elif defined __has_feature +# if __has_feature(address_sanitizer) +# define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1 +# endif +# endif #endif #endif