From patchwork Mon Jul 25 06:55:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?RGltaXRyaWplIE1pbG/FoWV2acSH?= X-Patchwork-Id: 153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6a10:b5d6:b0:2b9:3548:2db5 with SMTP id v22csp1484580pxt; Sun, 24 Jul 2022 23:56:20 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ug8xkYkDERN0Zgs6JxKlAKVkxd4v3NToGS+I31nAPjgfLw3jEaqeRlZVbchuse0stMrVvx X-Received: by 2002:a17:907:728c:b0:72b:995f:78d with SMTP id dt12-20020a170907728c00b0072b995f078dmr8837531ejc.348.1658732180697; Sun, 24 Jul 2022 23:56:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658732180; cv=pass; d=google.com; s=arc-20160816; b=k/aFKGXNOObklwq8GEyPke1bkz/LpbKoCoWMOscMsii6xvbKhetHsMiRBiAyjcvyQH dM22HgK9MZBrqZ/F7hzNefDQhTJ4dBGqjpMHQu3csK6Tn3hdQHePHTPgjoqjC5zL8Ion 1SfONkhJdmLKrtlnD+KJ8GOSgPKSKBEBKTt950uKb+r4aAULiA+84U0Rh8Lg5Fbxi7kL YsaJbcJ944fg97ds3QtaOPL/rQz1c8kIjuwFadgA0gVqugnnmkOebAVmgElA059pk/Tx sJ7wBWww64CwUW9B6/uhq5XE50rKgF0jgHVJlTua2TYTz6PjhE21N6N3Ti4R1CfeAOh2 JMTw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version :content-transfer-encoding:suggested_attachment_session_id :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:to:from:dkim-signature:dmarc-filter :delivered-to; bh=1m3deFw3ZDWNVqbJM0U9v1fX7PYPZUeCDl0UVF+3u20=; b=BG76CsCcx36X1+pONV9hVRczCikxTY2LRA880MoM1gzyT2zxHPpBcX3C8NJv3BtON+ aSttj42HsDzxvdd03AvSwyy5Mp8P/OMXzhblWVRKTbtxKow1QnxoVsLUYm8siOQbvQ/+ 0Yv3lUPdLLhz1BQWwOum73rhdFdh2qjWZZNFYi6CsmzwRsomxCBPTCY8XER7yvdFnBr2 /g9Ga8Dpp1cANBpxQNMhl4rM7Vm1mBjnMnr8g9fJ/rlGCM5JOch6DoycR9Fple55pzuX znG47sgepHctRKh7WA2gf2TcvVjzg7YNdxqM/ydmiCjIw0xhlFP687aQ5yX+uxr1aX0L O7tA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@syrmia.com header.s=selector1 header.b=dQEMxXDp; arc=pass (i=1 spf=pass spfdomain=syrmia.com dkim=pass dkdomain=syrmia.com dmarc=pass fromdomain=syrmia.com); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ce1-20020a170906b24100b0072f41de66b3si11080517ejb.942.2022.07.24.23.56.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jul 2022 23:56:20 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@syrmia.com header.s=selector1 header.b=dQEMxXDp; arc=pass (i=1 spf=pass spfdomain=syrmia.com dkim=pass dkdomain=syrmia.com dmarc=pass fromdomain=syrmia.com); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 132C3383F959 for ; Mon, 25 Jul 2022 06:56:18 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20095.outbound.protection.outlook.com [40.107.2.95]) by sourceware.org (Postfix) with ESMTPS id 15F883858403 for ; Mon, 25 Jul 2022 06:55:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 15F883858403 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=Syrmia.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Syrmia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lcyf6i87sY1Qmn6sfgHzLUNKvnsvoiv0WehH0VXhi9gv/UHWgQdx7PJxSdKP0hOhAiUBZ05fQgNMy1TixP+hpkwy9bgrNOA8kfHatYMt/XQSTA5+MKUeQDJ9nzUNyeoJecHjjRmY0xH/MyVPbgCIIDsYX2T1iKqwBgD8IuIjUD37QBBlSbR2mVtoMUe0zWhbtsWsNJfABJ9lwhz/WTK0nTNhQldfv/HUn2mS3LIQETLSxedS1+mBVeZBCXGFxxaSRMC4TTyIAO/BOGOHWK9Q1GiqWed8rpJGIep/LBSk4Eq/kAGkZNBllfA0rN32J57FyekU7VYZ/Xaz4QTAmBHl+w== 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=1m3deFw3ZDWNVqbJM0U9v1fX7PYPZUeCDl0UVF+3u20=; b=coH1pEc2Fa/TbhJaBl/uvglDQITL2AH2kDWd/4K/LxQFkjLRFP5lz+Ad83ZpPnhmZqF3ahsz+16kWdFGWDTI4mi7psDTHFMMD1c3D4FMeoSZfZ+QmE1LkeA/WinUHLhj1eMgsVFrWoStdl6p7HJtlkCA1yDu5jxLhKVx0DwzUGa4lip9TCOOUU3BiliNfReykDAJIAu/85FnYEjsj+JGYEJywVMmMXtD2ggMjozyz7CvVlxAhvcrt3O4mn8N2Qrlh+b5dyzTsYG/XRPtue1L4i0v75ID24uJGYicj7Zhutd0OMu2VmvrmGccbUe/vxBlBTDp0I+UyAxWJgKOxYcE7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=syrmia.com; dmarc=pass action=none header.from=syrmia.com; dkim=pass header.d=syrmia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=syrmia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1m3deFw3ZDWNVqbJM0U9v1fX7PYPZUeCDl0UVF+3u20=; b=dQEMxXDp7OLw4MjzAS1Z9aKFTVcj6+uAO2VTy7hqbWbvarF7hjfOmxJjaGiU4lydk3+E39lc+kwomYifxb2aUPCzyITPpkuW8Lzf/N4Q2RR+tZEiQScVOectjjgSwWTn6RbMaCI6NKqD3mLkDuTRPHL8JDn9yFwGzuuPC+/B2rI= Received: from VI1PR03MB4893.eurprd03.prod.outlook.com (2603:10a6:803:ba::33) by AM5PR03MB2914.eurprd03.prod.outlook.com (2603:10a6:206:23::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.24; Mon, 25 Jul 2022 06:55:50 +0000 Received: from VI1PR03MB4893.eurprd03.prod.outlook.com ([fe80::b07c:7f13:c88:e0ca]) by VI1PR03MB4893.eurprd03.prod.outlook.com ([fe80::b07c:7f13:c88:e0ca%3]) with mapi id 15.20.5438.023; Mon, 25 Jul 2022 06:55:49 +0000 From: Dimitrije Milosevic To: "gcc-patches@gcc.gnu.org" Subject: [PATCH] libsanitizer: Cherry-pick 2bfb0fcb51510f22723c8cdfefe from upstream Thread-Topic: [PATCH] libsanitizer: Cherry-pick 2bfb0fcb51510f22723c8cdfefe from upstream Thread-Index: AQHYn/Lafw1CGPNvR0ad+aW9jYBmBA== Date: Mon, 25 Jul 2022 06:55:49 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: d687024e-1db5-d0fc-9cc6-a676c2b0a7b2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=Syrmia.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a5ce42e0-db83-4724-bea5-08da6e0ab55c x-ms-traffictypediagnostic: AM5PR03MB2914:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Uo+bWr8FfUgucGmAOMQKq54z2fBVby7xt7iKASiiX0ZU9TBNcG/5X42CpA8tIXZyRepgKNDQ9md7+SGE3jYBmHGOQ91YG5Cw2Rix/dPPVcSlL2QfNFqfr8cJVABBJeAk0VMGjaQXxuqk2bJPZjZof3W4A59UTf/wRQlfPBb/uYBil9+V4pkAa2uXM5wIH2MnVYfm1DwwIAvUHx2P0nz2MaXqF2mLU38b/m88JBGrV2ghL2gSH6Ge6poIps5IYn6GXarn000XIGpsVrh+GciB8rCdXgTPupBWizl/YGISSWVFru2Q4qyZBjLYMl/2xQjN2LTxo4C1yyYyNdumrHuldbKPe6vnYQadeb5NRSodSjmWsSEJJ6Rhh4nuO4ZEMZgUURcKgX6XWL+InIFP4nVTW+WtxA+IK2GIG+tvmnkbvhh0zofcpN/9DYpn4omO9Xf2IENEgGpmIziH78LWcNxvhM5FR53+hSCEU9UnaaaZ3H6TJSvhq5PDuwO3tA7ecxCb4ffQTtyIeDYMMZxqcOELSyABDwo1eP48znR0Mr6ZfGNQf+4Y/7U8bNhTrZuuhb2dTK4c1+fkHWMfvh132HYfBHoQC+GalhpIB/89zrIJfPQnaz5EKwpUKOxA5xWutAlY7TxRrXKESDB11gaA3jfe7fdCuVrtZnKhUk+edrP1p0ImtFDduDY/OiSXHcGJw5FIDeC7UzlGRuOUo8A1/1/a1/ENNQ9fC6CCAundvfz17hXf9Kf602+bbS5Q50IlQVtYymnfkMdc0l8odT5T4dCXLEWEzDxA6cigbjucV0PDvsU= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR03MB4893.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(396003)(39830400003)(376002)(366004)(136003)(346002)(71200400001)(6916009)(54906003)(41300700001)(6506007)(7696005)(9686003)(478600001)(26005)(316002)(2906002)(55016003)(8936002)(52536014)(5660300002)(91956017)(66446008)(64756008)(8676002)(66946007)(76116006)(66476007)(4326008)(66556008)(122000001)(38100700002)(38070700005)(86362001)(33656002)(83380400001)(186003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?8z+1AkUIU9a4uc90R9bMM6q?= =?iso-8859-1?q?0v8cc6r69329bBGlY5uMbTrBJIFJeZ8nsmrz4c5+xH4CYcibsyFXl7980JId?= =?iso-8859-1?q?OwmkJNY3C//a9S2L1mG1p00PdOjTaw9xMFI+W1y6mzDX+c80qdKA0ETU3Qgx?= =?iso-8859-1?q?3RjfL5ZWD08IyS4F+xAWxJxWDW3vG3bsWU1uRgmO9T2xuQBJpjrXxvWMs4yD?= =?iso-8859-1?q?wLdNoNonnAb1drIWPWUYDdHN/YO5cpkIcIFcdIiGTXkVMZSfvkxDxmUmFtLj?= =?iso-8859-1?q?gP2Cl5Uco8BTlBincgfzotnMsKa2EsaaI38ph2w3M2FUG+eT1Cttj/vwD3eQ?= =?iso-8859-1?q?9lRo02nV57GozIbjpH2VI1pibeP0AWBlcDDoEtVymNXO82TpEY4d0NvtSe8K?= =?iso-8859-1?q?0Te/TUkQ3952eVXXITrqsAcEldiLYltPvp8pJVyECZwkOVaQUQ4BoxBYqOkc?= =?iso-8859-1?q?bvxZ6Bo/IkMUzPnsIvT3ibqzN0r8ebKJYLzlY7dNuruPGHna46CyDxtoDtVU?= =?iso-8859-1?q?uujC8kpfla0/7DgKSCet1Wf5WZipwyYIvnOqomKH2cGxr6ikHX+ZynnNlHjr?= =?iso-8859-1?q?558CPUoKKocCsaJ3N8KRVudHnMhFr6dj5ghV+DT9PexB8lLA+KV/09p9VXl0?= =?iso-8859-1?q?JWQc97ZRNXbaiT95x/2voGdq8KZomKqwkVjpkvaoORlp3dpIlQEzkIO6MhbH?= =?iso-8859-1?q?uZwWKJ2LD9EgijfsPo1iZLJsZipSSenwwioMn1CuEOQPx7KM63rCSsk/rQxB?= =?iso-8859-1?q?md/lMz6/MMmuP4SGEiKQIIqCfx5PiDGYL47GTIv63F09Bp1SZeGSO9EKyex2?= =?iso-8859-1?q?OoxEB2DSCLGV5R36iK4o7Er64w1vwyFqsF9VHhg5W7DwsayLFPmho0fuRHdU?= =?iso-8859-1?q?VTYOESqxPTR7Y8ioTaOvwuXQ8++EavE73I9gnLfnorrlfT14Cd6XGJsQQjly?= =?iso-8859-1?q?ZFvC0Ng4anjfJ4txtP2O7QHyzDKOu4L3gxKMrrWrzxa0oi1QDwyZvwcuAcGN?= =?iso-8859-1?q?t67Mu/0F0hn+RRW+JUfDZXgMp3FrqBOdJOW/PhP5454OApuCTm33nXTyvDqZ?= =?iso-8859-1?q?0FPhldsm++2qRxbyH09MyazUxgbxll+rKELTTFZftjLgqdv7mZrQ+K7TY77v?= =?iso-8859-1?q?wzUHGH4C05UZiB2ZWrugNRCpj2B+xm7+e5p3Bfh86qMjsb8c2wC/lHod/0gF?= =?iso-8859-1?q?iU8Mxw7xjBY8etidCaFv6mVNiNbmejeEqw08no+tw5duUvw5UDx3ekshMm7T?= =?iso-8859-1?q?APEEi9VocdeDjW4sM362tkWmfNYUXT2spZHxGR5gCR6DpJwsa93BuQFo8OE3?= =?iso-8859-1?q?+zduUoH6vDljnOulbSSNJnU4z5WTdthdjAnSz7eg9i719dvVl5yjt1C4aVBP?= =?iso-8859-1?q?TTobpNJtzZ0/bKz/MnhuGSpAJQqOSGNeftKrQKGUFIJ3aurLMDlHbZYVvvy4?= =?iso-8859-1?q?cGfBdfqjIhYg48fLO/FS0Ba1Te6CNqTafYbx53K/lD5hZ1i2LsCHVsyMVc/4?= =?iso-8859-1?q?orIdgztkHzdFfkf4y/24DRLHP7zIIZ7QsztlHE9OtQre7xZgXunKzW2zi3Ta?= =?iso-8859-1?q?y5R7DBHn/WR+7BaS5Vmx+TuEKbwG+ol3hHXoGApU0b7/pFI85F/K4MSomNkm?= =?iso-8859-1?q?bsr+tiU5YKzHEAlj2XU3BZ4ixH4uoFM9AgpQTow=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: syrmia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4893.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5ce42e0-db83-4724-bea5-08da6e0ab55c X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jul 2022 06:55:49.7360 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 19214a73-c1ab-4e19-8f59-14bdcb09a66e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: TTa4cur5+xbTtVhwAAdJLJOT6ReBg2V3OSiNAJ6r5vcwpUPiGzf+nZA543VIV1jUGrHLPt/EtLhSuIX5wq0utdH4tj2f8y42tY2RnyfZuDs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR03MB2914 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Cc: Djordje Todorovic Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1739306755331135502?= X-GMAIL-MSGID: =?utf-8?q?1739306755331135502?= 2bfb0fcb51510f22723c8cdfefe [Sanitizer][MIPS] Fix stat struct size for the O32 ABI. Signed-off-by: Dimitrije Milosevic . Signed-off-by: Dimitrije Milosevic . --- .../sanitizer_common/sanitizer_platform_limits_posix.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h index 89772a7e5c0..75c6cc7f285 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h @@ -81,9 +81,10 @@ const unsigned struct_kernel_stat64_sz = 104; const unsigned struct_kernel_stat_sz = 144; const unsigned struct_kernel_stat64_sz = 104; #elif defined(__mips__) -const unsigned struct_kernel_stat_sz = SANITIZER_ANDROID - ? FIRST_32_SECOND_64(104, 128) - : FIRST_32_SECOND_64(144, 216); +const unsigned struct_kernel_stat_sz = + SANITIZER_ANDROID + ? FIRST_32_SECOND_64(104, 128) + : FIRST_32_SECOND_64((_MIPS_SIM == _ABIN32) ? 160 : 144, 216); const unsigned struct_kernel_stat64_sz = 104; #elif defined(__s390__) && !defined(__s390x__) const unsigned struct_kernel_stat_sz = 64;