aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@fitzsim.org>2021-05-27 21:53:29 -0400
committerMarc Poulhiès <dkm@kataplop.net>2021-05-28 13:14:44 +0200
commit13f995c199ac61f02dd01c85bd5d33a24fee91bc (patch)
treeba879fd83b816556beb04b30e6a3e0c87b312aea
parent8f5b38ebde3279f2ab0e65ffcfdeb9d67d7df2cc (diff)
downloadgcc-13f995c199ac61f02dd01c85bd5d33a24fee91bc.zip
gcc-13f995c199ac61f02dd01c85bd5d33a24fee91bc.tar.gz
gcc-13f995c199ac61f02dd01c85bd5d33a24fee91bc.tar.bz2
rs6000: Override TARGET_RUST_OS_INFO in linux64.h
Both config/rs6000/sysv4.h and config/rs6000/linux64.h define TARGET_RUST_OS_INFO, and both are included in that order in tm.h. This change eliminates the error directive, permitting the more specific definition in linux64.h to override the prior definition in sysv4.h. gcc/ChangeLog: 2021-05-27 Thomas Fitzsimmons <fitzsim@fitzsim.org> * config/rs6000/linux64.h: Undefine TARGET_RUST_OS_INFO before defining it.
-rw-r--r--gcc/config/rs6000/linux64.h5
1 files changed, 2 insertions, 3 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(); \