public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/rust/master] Merge commit '95dc11475dac06b5eecd904079de8aa94827a36a' into HEAD [#1619]
@ 2023-02-13 13:10 Thomas Schwinge
  0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2023-02-13 13:10 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:09e9d996b0a7f12b713807b5d166a014c392b0a2

commit 09e9d996b0a7f12b713807b5d166a014c392b0a2
Merge: 81007c52548 95dc11475da
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Sun Feb 12 16:22:35 2023 +0100

    Merge commit '95dc11475dac06b5eecd904079de8aa94827a36a' into HEAD [#1619]
    
    Conflicts:
            gcc/rust/parse/rust-parse-impl.h
    
    This overrides GCC/Rust #1619 commit db4b399c25fd3c37e52c6b8dbdf6bc9c0f1deb6c
    "parser: Fix ICE in closure parsing"
    with upstream GCC commit r13-4697-g95dc11475dac06b5eecd904079de8aa94827a36a
    "rust: Fix up aarch64-linux bootstrap [PR106072]".

Diff:

 gcc/rust/parse/rust-parse-impl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2023-02-13 13:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-13 13:10 [gcc/devel/rust/master] Merge commit '95dc11475dac06b5eecd904079de8aa94827a36a' into HEAD [#1619] Thomas Schwinge

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).