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

https://gcc.gnu.org/g:7d39b61800112febb6de6ec8a44f116e48a63baa

commit 7d39b61800112febb6de6ec8a44f116e48a63baa
Merge: e9b5dc738b0 f80f540e394
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Sun Feb 12 16:28:14 2023 +0100

    Merge commit 'f80f540e394e87ac70349bad109bfc4b465c7c98' into HEAD [#1512]
    
    Conflicts:
            gcc/config/rs6000/rs6000-logue.cc
    
    This overrides GCC/Rust #1512 commit 8e9dcd47d3ea97bd4bea892ad4c968acf486676b
    "Add missing language selection for rs6000"
    with upstream GCC commit r13-4762-gf80f540e394e87ac70349bad109bfc4b465c7c98
    "rs6000: Add Rust support to traceback table".

Diff:

 gcc/config/rs6000/rs6000-logue.cc | 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:11 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:11 [gcc/devel/rust/master] Merge commit 'f80f540e394e87ac70349bad109bfc4b465c7c98' into HEAD [#1512] 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).