From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugzilla@gcc.gnu.org>
Received: by sourceware.org (Postfix, from userid 48)
	id 23824385B52D; Thu,  9 Nov 2023 08:10:28 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 23824385B52D
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1699517428;
	bh=7BgaeBdgondeOjShfoMKjrIlaFKTy48/yiXf5UKp1TY=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=bjD35Ofg69IyczadiV0JzF6/yYweBqdq26h+yCcP1DmUFIsQ2zXMGFZksqPhJ2XtK
	 /HnX74QrQ4aYUiV4kl0yPtPwQxzqYgD7wJlCltjsRSqNbgAfRBMYDzqO8yIbTJG/GY
	 bK/7YlVROmzE2VG7xpnpF0YMKLV4ENvZ+F8pRa90=
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug libstdc++/21769] per-file control over PCH inclusion
Date: Thu, 09 Nov 2023 08:10:23 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: libstdc++
X-Bugzilla-Version: 4.1.0
X-Bugzilla-Keywords: 
X-Bugzilla-Severity: enhancement
X-Bugzilla-Who: cvs-commit at gcc dot gnu.org
X-Bugzilla-Status: RESOLVED
X-Bugzilla-Resolution: FIXED
X-Bugzilla-Priority: P2
X-Bugzilla-Assigned-To: paolo.carlini at oracle dot com
X-Bugzilla-Target-Milestone: 4.3.5
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-21769-4-Pv0dnsTXSl@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-21769-4@http.gcc.gnu.org/bugzilla/>
References: <bug-21769-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
List-Id: <gcc-bugs.sourceware.org>

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D21769

--- Comment #9 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The releases/gcc-13 branch has been updated by Jonathan Wakely
<redi@gcc.gnu.org>:

https://gcc.gnu.org/g:5d036ff51e2491401b9a64705bfd7f7467764260

commit r13-8029-g5d036ff51e2491401b9a64705bfd7f7467764260
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Aug 16 21:46:05 2023 +0100

    libstdc++: Fix testsuite no_pch directive

    The { dg-add-options no_pch } directive is supposed to add a macro
    definition that invalidates the PCH file, and ensures that the #include
    directives in the test file are processed as written. But the proc that
    adds the options actually removes all existing options, cancelling out
    any previous dg-options directive.

    This means that using no_pch will cause FAILs in a file that relies on
    other options set by an earlier dg-options.

    The no_pch directive was added for PR libstdc++/21769 where Janis
    suggested adding it as return "$flags -D__GLIBCXX__=3D99999999" but what
    was actually committed didn't include the $flags so replaced them.

    Additionally, using no_pch  only prevents the precompiled version of
    <bits/stdc++.h> from being included, it doesn't prevent the
    non-precompiled version being included by -include bits/stdc++.h in the
    test flags. Use regsub to filter that out of the options as well.

    libstdc++-v3/ChangeLog:

            * testsuite/lib/dg-options.exp (add_options_for_no_pch): Remove
            any "-include bits/stdc++.h" from options and add the macro to
            the existing options instead of replacing them.

    (cherry picked from commit 91315f23ba127ea4d1a584023bae34e143f6eb8c)=