diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-05-28 11:44:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-28 11:44:48 +0000 |
| commit | 0a3696a4a810e2b9f372b0dc4f79c044ff59811b (patch) | |
| tree | c5491d8f30b73482163d78356267f53a7ac735cc /gcc | |
| parent | 8f5b38ebde3279f2ab0e65ffcfdeb9d67d7df2cc (diff) | |
| parent | 83c161d0b828b63b2b1a50530c7bea367ec30896 (diff) | |
| download | gcc-0a3696a4a810e2b9f372b0dc4f79c044ff59811b.zip gcc-0a3696a4a810e2b9f372b0dc4f79c044ff59811b.tar.gz gcc-0a3696a4a810e2b9f372b0dc4f79c044ff59811b.tar.bz2 | |
Merge #454
454: Fix rs6000 r=dkm a=dkm
Applying 2 patches sent on GCC mailing-list.
These changes fix errors in the current Rust testsuite.
Co-authored-by: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config/rs6000/linux64.h | 5 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000-logue.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h index fbd8cf0..536007c 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -314,9 +314,8 @@ extern int dot_symbols; } \ while (0) -#ifdef TARGET_RUST_OS_INFO -# error "TARGET_RUST_OS_INFO already defined in linux64.h (rs6000) - c++ undefines it and redefines it." -#endif +/* Override less-specific rs6000/sysv4.h definition. */ +#undef TARGET_RUST_OS_INFO #define TARGET_RUST_OS_INFO() \ do { \ GNU_USER_TARGET_RUST_OS_INFO(); \ diff --git a/gcc/config/rs6000/rs6000-logue.c b/gcc/config/rs6000/rs6000-logue.c index b0ac183..7da8db6 100644 --- a/gcc/config/rs6000/rs6000-logue.c +++ b/gcc/config/rs6000/rs6000-logue.c @@ -5262,12 +5262,13 @@ rs6000_output_function_epilogue (FILE *file) use language_string. C is 0. Fortran is 1. Ada is 3. Modula-2 is 8. C++ is 9. Java is 13. Objective-C is 14. Objective-C++ isn't assigned - a number, so for now use 9. LTO, Go, D, and JIT aren't assigned - numbers either, so for now use 0. */ + a number, so for now use 9. LTO, Go, D, Rust, and JIT aren't + assigned numbers either, so for now use 0. */ if (lang_GNU_C () || ! strcmp (language_string, "GNU GIMPLE") || ! strcmp (language_string, "GNU Go") || ! strcmp (language_string, "GNU D") + || ! strcmp (language_string, "GNU Rust") || ! strcmp (language_string, "libgccjit")) i = 0; else if (! strcmp (language_string, "GNU F77") |