diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2023-02-12 16:28:14 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2023-02-12 16:28:14 +0100 |
| commit | 7d39b61800112febb6de6ec8a44f116e48a63baa (patch) | |
| tree | 1f2cfe9cbb5cbbd53bb3f236ee58bb6581bfe7f3 /gcc | |
| parent | e9b5dc738b08b6e4af74b3ab1bea08db21ba7893 (diff) | |
| parent | f80f540e394e87ac70349bad109bfc4b465c7c98 (diff) | |
| download | gcc-7d39b61800112febb6de6ec8a44f116e48a63baa.zip gcc-7d39b61800112febb6de6ec8a44f116e48a63baa.tar.gz gcc-7d39b61800112febb6de6ec8a44f116e48a63baa.tar.bz2 | |
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".
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config/rs6000/rs6000-logue.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/config/rs6000/rs6000-logue.cc b/gcc/config/rs6000/rs6000-logue.cc index 0a0d229..669a258 100644 --- a/gcc/config/rs6000/rs6000-logue.cc +++ b/gcc/config/rs6000/rs6000-logue.cc @@ -5350,8 +5350,8 @@ rs6000_output_function_epilogue (FILE *file) || ! strcmp (language_string, "GNU GIMPLE") || ! strcmp (language_string, "GNU Go") || ! strcmp (language_string, "GNU D") - || ! strcmp (language_string, "libgccjit") - || ! strcmp (language_string, "GNU Rust")) + || ! strcmp (language_string, "GNU Rust") + || ! strcmp (language_string, "libgccjit")) i = 0; else if (! strcmp (language_string, "GNU F77") || lang_GNU_Fortran ()) |