]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
projects / thirdparty / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81007c5 95dc114)
Merge commit '95dc11475dac06b5eecd904079de8aa94827a36a' into HEAD [#1619]
authorThomas Schwinge <thomas@codesourcery.com>
Sun, 12 Feb 2023 15:22:35 +0000 (16:22 +0100)
committerThomas Schwinge <thomas@codesourcery.com>
Sun, 12 Feb 2023 15:22:35 +0000 (16:22 +0100)
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]".

1  2 
gcc/rust/parse/rust-parse-impl.h patch | diff1 | diff2 | blob | history

diff --cc gcc/rust/parse/rust-parse-impl.h
Simple merge
Mirror of https://gcc.gnu.org/git/gcc.git