From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 65E203853D25 for ; Fri, 30 Jun 2023 08:42:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 65E203853D25 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688114577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ip8jlKhHvZDA3n6M+/O2tG3osZnlIVG8FIuhfqDp3Zg=; b=hdsXNO8LTdV2vYLFnZD/jhb94Mmo7hZnqZeoUgXRORZ/3weVPi8AbdIIWi1lKlYKzakOcB w5w9Vf6XsEuPDYwBlwy+q72EXa2t3kxCj6rY2az6aIbHDIbU0wJxktF45ZIQhBQs2br0cz Wa4eIRyslvCXPfllmtwiXwwELocQIFA= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-537-XBcoEHwTNVKX_gPBRpuE8Q-1; Fri, 30 Jun 2023 04:42:50 -0400 X-MC-Unique: XBcoEHwTNVKX_gPBRpuE8Q-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2b6ad424a46so15638331fa.3 for ; Fri, 30 Jun 2023 01:42:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688114560; x=1690706560; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ip8jlKhHvZDA3n6M+/O2tG3osZnlIVG8FIuhfqDp3Zg=; b=UHyJAVRV5b33PCQvORb74GHAHxTP3iXCtYoD9TODmzDyIWywklpgz7fc/yHLb1uyPu 8F5j13X9waM516NePZdxyd53b//JEWjsFVaQcFlb/GJuYTzKs59JNfjKjqlnpi84P0yK 0AW4aPAFjqzn8U6k/nZK7YYkW6ylsC+P/bxGRBZAYX5dyvGZMgdkyssmG6YapARXei3T om3AF9eLzI8TqklPaYlsGxYLlTkhe6LALTinNVV2puCD3dyE2MISzYjyqyy/czFOgMzc laG4f+OFbZ0m+9bKagb0IsKGG6WbD4P7vPFospxFimlrMdC0ORTA0KIhiqXgoHyYVgw7 onEA== X-Gm-Message-State: ABy/qLYomQaJO0fMDmxpGIfS6FfqcvhOn0jwmRN6gQRwmPB7r3hCTGMj h6v5SlU9yqsw1LEdd925ovQWnolbdxU3NynBSHviVZ6tlHphE4ExHWMOA1DZRI3zioHfT9nUSyY hEeExa9qBWyuj0t0DH7wmlDgdi8a7Xtih5A== X-Received: by 2002:a2e:88c8:0:b0:2b6:ca1d:ee88 with SMTP id a8-20020a2e88c8000000b002b6ca1dee88mr1588231ljk.12.1688114560090; Fri, 30 Jun 2023 01:42:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlFp01RsxB3LLyuz+r/cgvWj46XJjU4nLaKHjujE+FIVp8l5INfU/T7WuqUFLjF2sUwhni/ynn+8c/xd2vzzdmI= X-Received: by 2002:a2e:88c8:0:b0:2b6:ca1d:ee88 with SMTP id a8-20020a2e88c8000000b002b6ca1dee88mr1588217ljk.12.1688114559708; Fri, 30 Jun 2023 01:42:39 -0700 (PDT) MIME-Version: 1.0 References: <20230630034847.0D200203F8@pchp3.se.axis.com> In-Reply-To: <20230630034847.0D200203F8@pchp3.se.axis.com> From: Jonathan Wakely Date: Fri, 30 Jun 2023 09:42:28 +0100 Message-ID: Subject: Re: PR108672 re-fixed after [PATCH] libstdc++: Synchronize PSTL with upstream To: Hans-Peter Nilsson Cc: Thomas Rodgers , libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-6.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Fri, 30 Jun 2023 at 04:48, Hans-Peter Nilsson wrote: > > > Date: Mon, 26 Jun 2023 11:57:49 -0700 > > From: Thomas Rodgers via Gcc-patches > > > On Wed, May 17, 2023 at 12:32 PM Jonathan Wakely wrote: > > > All the actual code changes look good. > > Unfortunately, this overwrote the fix for PR108672. I take > it there's a step missing from the synchronization process; > a check that no local commits are overwritten? Sounds like > something that can be fully scripted (not volunteering) or > already available (like, "list all commits affecting > contents touched by/between two named commits"). > > I did *not* check whether any other local commits were also > overwritten. Also, not sure about whether better try to get > this upstreamed: __INT32_TYPE__ seems gcc-specific. Clang does support it too, but I agree that upstream might not want that change. > Anyway, r13-5702-g72058eea9d407e was "re-committed" per > below as obvious after regtesting cris-elf. Thanks. I'll add an include/pstl/LOCAL_PATCHES file listed the commits we apply locally after importing the upstream sources. Based on git history, the initial list of commits is: r9-6908-g0360f9ad4048ea r9-6942-g9eda9f9231f287 r9-7071-ga34d6343a758f6 r10-572-g34d878c7bc86d4 r10-1314-g32bab8b6ad0a90 r11-7339-g7e647d71d556b7 r12-7699-gac73c944eac88f r13-3708-ge3b10249119fb4 r13-5702-g72058eea9d407e But several of those have been incorporated upstream, or were reapplied correctly to our downstream copies. We'll go through the list and find which ones need to stay there. It looks like r10-1314-g32bab8b6ad0a90 was lost and should be re-applied.