From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2045.outbound.protection.outlook.com [40.107.21.45]) by sourceware.org (Postfix) with ESMTPS id B8AAF3858D20 for ; Mon, 14 Mar 2022 16:12:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B8AAF3858D20 Received: from DU2PR04CA0229.eurprd04.prod.outlook.com (2603:10a6:10:2b1::24) by DBBPR08MB6188.eurprd08.prod.outlook.com (2603:10a6:10:1f6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.25; Mon, 14 Mar 2022 16:12:12 +0000 Received: from DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:2b1:cafe::c1) by DU2PR04CA0229.outlook.office365.com (2603:10a6:10:2b1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.26 via Frontend Transport; Mon, 14 Mar 2022 16:12:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT012.mail.protection.outlook.com (10.152.20.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.22 via Frontend Transport; Mon, 14 Mar 2022 16:12:11 +0000 Received: ("Tessian outbound 63bb5eb69ee8:v113"); Mon, 14 Mar 2022 16:12:11 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 6ad8c19c10807707 X-CR-MTA-TID: 64aa7808 Received: from a2b92b0aff62.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 04D4A3AE-E83D-4631-BDF7-B9F5B212CC4C.1; Mon, 14 Mar 2022 16:12:04 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a2b92b0aff62.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 14 Mar 2022 16:12:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RyY3wOhueEnDRysCftj7zumsFGks+YeVSJWQFNowXppd/mPqTnY1XIMiUWEVyTFJ8UVxjwGewOlcea3wv3MqeCY2BQH3KVwn1L9OIr1EmLOZY9q7bMmxFlLCnajj2mLCV/DCnAVAGsU0Qrl4Sh31XV0TVFQcdqqiYi4n56lobHXVTZbq0yfQTkZ+TN+KIQ2TSmWZpvMZm8KDQrqbVC3kkBpmrAiWn/U/bqUYFqF25JZAVQDrVd16tDNc4VzrP1O9PYtcrsiqyKiHPQtFhJ1liyQGgzRu+P5vzncXq++Izzlu2YKmxZHQtI1rcvyXoAni4jC+UtkLpXl42A3+iVW9iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H0br1l4blBc9qJ+K8wIP4zfakDfafIWYMVtkrVVUYJ0=; b=TWogS0Kwodz84+Jp17xIVm0weK3XvcAWDwvIxvMLto38o/KNQnbAhoT+w07W4CpKrNhEqo83oMvJ2T5yNWuniM/t1mKePR9IJsa/crLQojNHkSY5lUQdr0zbq/FFy3T+uuTiTDjfCdus/37aW9vLDCOazgdDFeqR8AKeZXW8gEXaHi/reoSNFXE/Rc72JoFhskqt1jB/aJASBi8S0+Wtkhgcwpu3C5aZvKmAqwXU70xiwD56PFmbyE4/rzsB2C+t2xx78+YHQyKwIgYI8w/RPG5WkaYZZgKUSit40KUCpmfQ+rplwka0sFAnOREmZRL4Eg9gf7xM3t4r2+LuZRkxbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from DBAPR08MB5589.eurprd08.prod.outlook.com (2603:10a6:10:1a2::23) by PAXPR08MB6607.eurprd08.prod.outlook.com (2603:10a6:102:152::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.28; Mon, 14 Mar 2022 16:12:03 +0000 Received: from DBAPR08MB5589.eurprd08.prod.outlook.com ([fe80::b5c1:bcf1:ffcf:8219]) by DBAPR08MB5589.eurprd08.prod.outlook.com ([fe80::b5c1:bcf1:ffcf:8219%6]) with mapi id 15.20.5061.028; Mon, 14 Mar 2022 16:12:03 +0000 From: Richard Sandiford To: Xi Ruoyao Mail-Followup-To: Xi Ruoyao , gcc-patches@gcc.gnu.org, Richard Biener , Jeff Law , YunQiang Su , richard.sandiford@arm.com Cc: gcc-patches@gcc.gnu.org, Richard Biener , Jeff Law , YunQiang Su Subject: Re: [PATCH 1/2] libsanitizer: cherry-pick db7bca28638e from upstream References: <7df02e5097a4b6ac9971ce581c2f2ad0d39817b1.camel@mengyan1223.wang> Date: Mon, 14 Mar 2022 16:12:01 +0000 In-Reply-To: <7df02e5097a4b6ac9971ce581c2f2ad0d39817b1.camel@mengyan1223.wang> (Xi Ruoyao's message of "Fri, 11 Mar 2022 11:25:28 +0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) Content-Type: text/plain X-ClientProxiedBy: LO2P265CA0492.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:13a::17) To DBAPR08MB5589.eurprd08.prod.outlook.com (2603:10a6:10:1a2::23) MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: ac9319f7-9a4d-4ded-8e45-08da05d5658d X-MS-TrafficTypeDiagnostic: PAXPR08MB6607:EE_|DB5EUR03FT012:EE_|DBBPR08MB6188:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: oyKz/PieNSO5hjOVLLbZlMuSl/vxHKOq9vnhf1NhclF0J1RQE17asVEm7RShu4Ev7vFS+8slr8nhxGiLRFUAPevcL0bZLKH9Mw3/bKo5TwlE5tgFWg2qwcct1QLX8ef4BdHj/IU2JJ4+2OXwwASJgt6HbjoaI+NGQD8vVAwCfrjnnMSvvF97egLlGnIcIN8458IIK5kKP62IaC6NS0Z/bTYQaWWiijso57OItob+Aya4O5tIuSUvzOT9GAa/ZJEm8ZhMpnXm9NbYY2T4IPglmoqB24+19LrZ6A82oOJKu7ZktsDorR2nfrzmdYj5MShCtLzNhx0qUdmZQc3wHz+xE/YMMMmkjjJKwtN6tGiNlVinCdY5HyxeTt+3nxQ6r+iatUia3YAu9GB2l9ZPUlQZp4Pz4yFDbN4e0awBoWgH3bNJmPiN9kYWH/bDbVPJZOumpJ/pLtkrtfMu1GbYMz1XsxpsfmGPnAfAK/NlVX5PuXG0kRGPfQ8Na8oO06JGuzCmjUeWeu7FeNmvinaLc5yPlwp1CHFShH/KVDsws0gS+c4618a6lm03LXH7Q8+LujYiwS+Dy1R8Q0oEMBOtYgQJkiKtC0cOdQbpc+rKaF4uDQtjmLAxp5puYy42KNCTeyMWggqjZVnaqgO+VQnud0fWDA== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBAPR08MB5589.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(316002)(86362001)(38100700002)(6486002)(6916009)(54906003)(5660300002)(44832011)(2906002)(8936002)(4326008)(8676002)(66476007)(66946007)(66556008)(83380400001)(36756003)(2616005)(508600001)(6512007)(6506007)(186003)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6607 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: c84874a3-6001-4716-f74d-08da05d5605b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /5F2VPPewasKauc5H/kQ6d27xIpiHbUjUWEhHixardR8sYqUgG6YXAlA09tUaSYoGfAYEx2Bmhbb3996NBcR1nbmJXa9SJEW9jiB5+upTolZrNYFMRc9LWLe5pxLm6OlnFV2VXcg8FxYRyPvsIlD6pkvCbGEMHkI4EphMQY1exK40PqqYqtAVCBTdVShDt9e+0YfnoyK8Vu0oxY9U2UkXE9nVWra41eJIqxcKK1WPACf2AZ22QeXT6VWFEQk6gFvmgJ7ScSHKU5Qedy959Pn8CYhKdu3CKd/EhTR4xkvWeYq38YojV4QCSuRf+WLCH09OatPd9egyZ27YOSW3zTvy/w4EJaoWwOFBMc/892NYapZ5NcYKN8e6nr4j3lB1Ha8NgIBsukM4X6PfELf27mtZckJDbCYABo4efhPr8GliHvdNFJBu9YGZa/j8OxIvfOHlzWVSNUiUQfBskYenEm6qQ3epXn+mRB5jLvrDWwEmba+p3hBUc1OnhXOLZC8VPyzxUYyEa/+YyPHHgZL2kKxU9s/l0lxHBT8CmwnPeJrADSjGBP4XJgTv9O8RMxzNBcEbfrodPo2Ttx35RZ8ICk76SrafWDpdQJvjjrJ2ADISI7JCs/MhMrqea54z+CwSM4CvcHfI/DFheDJTiJ6QxiwlQkI8yir53COTP6Kp1/ajLAargQBZjW/M50SFJG5vTIR X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(44832011)(8936002)(356005)(81166007)(47076005)(40460700003)(36860700001)(5660300002)(36756003)(83380400001)(2906002)(2616005)(336012)(186003)(82310400004)(26005)(6506007)(107886003)(54906003)(6512007)(316002)(4326008)(86362001)(508600001)(70206006)(6486002)(8676002)(70586007)(6862004); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2022 16:12:11.6139 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac9319f7-9a4d-4ded-8e45-08da05d5658d X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6188 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Mar 2022 16:12:17 -0000 Xi Ruoyao writes: > libsanitizer/ > > * sanitizer_common/sanitizer_atomic_clang.h: Ensures to only > include sanitizer_atomic_clang_mips.h for O32. OK, thanks. Richard > --- > libsanitizer/sanitizer_common/sanitizer_atomic_clang.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h b/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h > index fc13ca52dda..ccf18f0786d 100644 > --- a/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h > +++ b/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h > @@ -96,8 +96,8 @@ inline bool atomic_compare_exchange_weak(volatile T *a, > // This include provides explicit template instantiations for atomic_uint64_t > // on MIPS32, which does not directly support 8 byte atomics. It has to > // proceed the template definitions above. > -#if defined(_MIPS_SIM) && defined(_ABIO32) > - #include "sanitizer_atomic_clang_mips.h" > +#if defined(_MIPS_SIM) && defined(_ABIO32) && _MIPS_SIM == _ABIO32 > +# include "sanitizer_atomic_clang_mips.h" > #endif > > #undef ATOMIC_ORDER