From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <hp@bitrange.com>
Received: from arjuna.pair.com (arjuna.pair.com [209.68.5.131])
 by sourceware.org (Postfix) with ESMTPS id 8C2CA3858406
 for <gcc-patches@gcc.gnu.org>; Sat,  9 Jul 2022 01:42:04 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8C2CA3858406
Authentication-Results: sourceware.org;
 dmarc=none (p=none dis=none) header.from=bitrange.com
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bitrange.com
Received: by arjuna.pair.com (Postfix, from userid 3006)
 id 3A84A8A56E; Fri,  8 Jul 2022 21:42:04 -0400 (EDT)
Received: from localhost (localhost [127.0.0.1])
 by arjuna.pair.com (Postfix) with ESMTP id 39EB38A547;
 Fri,  8 Jul 2022 21:42:04 -0400 (EDT)
Date: Fri, 8 Jul 2022 21:42:04 -0400 (EDT)
From: Hans-Peter Nilsson <hp@bitrange.com>
X-X-Sender: hp@arjuna.pair.com
To: Dimitrije Milosevic <Dimitrije.Milosevic@Syrmia.com>
cc: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>, 
 Djordje Todorovic <Djordje.Todorovic@syrmia.com>
Subject: Re: Mips: Fix kernel_stat structure size
In-Reply-To: <AM0PR03MB488253CF19B1113D56777D3182BD9@AM0PR03MB4882.eurprd03.prod.outlook.com>
Message-ID: <alpine.BSF.2.20.16.2207082134410.89039@arjuna.pair.com>
References: <AM0PR03MB488253CF19B1113D56777D3182BD9@AM0PR03MB4882.eurprd03.prod.outlook.com>
User-Agent: Alpine 2.20.16 (BSF 172 2016-09-29)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, GIT_PATCH_0,
 KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP,
 T_SCC_BODY_TEXT_LINE 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 <gcc-patches.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>,
 <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>,
 <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jul 2022 01:42:05 -0000

On Fri, 1 Jul 2022, Dimitrije Milosevic wrote:

> Fix kernel_stat structure size for non-Android 32-bit Mips.
> LLVM currently has this value for the kernel_stat structure size,
> as per compiler-rt/lib/sanitizer-common/sanitizer_platform_limits_posix.h.
> This also resolves one of the build issues for non-Android 32-bit Mips.

I insist that PR105614 comment #7 is the way to go, i.e. fix
the merge error, avoiding the faulty include that it
reintroduced.  Was this tested on O32?

>
>     libsanitizer/ChangeLog:
>
>             * sanitizer_common/sanitizer_platform_limits_posix.h: Fix
>             kernel_stat structure size for non-Android 32-bit Mips.
>
> ---
>
>  libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
> index 89772a7e5c0..62a99035db3 100644
> --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
> +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
> @@ -83,7 +83,7 @@ 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);
> +                                           : FIRST_32_SECOND_64(160, 216);
>  const unsigned struct_kernel_stat64_sz = 104;
>  #elif defined(__s390__) && !defined(__s390x__)
>  const unsigned struct_kernel_stat_sz = 64;
>
> ---