diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-02 22:10:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 22:10:29 +0000 |
| commit | 324dfb828cec09f7638b48b6e25e4007b45b9cbc (patch) | |
| tree | 11dcec8b1a25287685106f5c6605ce297258dd33 | |
| parent | 59b417323b25072aff2662f1f54f417f7b7ded61 (diff) | |
| parent | 6b6fcbb6a4bfcf038a4db952a65d4513ba0f5056 (diff) | |
| download | gcc-324dfb828cec09f7638b48b6e25e4007b45b9cbc.zip gcc-324dfb828cec09f7638b48b6e25e4007b45b9cbc.tar.gz gcc-324dfb828cec09f7638b48b6e25e4007b45b9cbc.tar.bz2 | |
Merge #475
475: rs6000: Override TARGET_RUST_OS_INFO in linux.h r=tschwinge a=glaubitz
Like 64-bit PowerPC, 32-bit PowerPC has the issue that
TARGET_RUST_OS_INFO is defined in both config/rs6000/sysv4.h
and config/rs6000/linux.h which triggers an error directive.
Thus, apply the same fix which undefines TARGET_RUST_OS_INFO
in linux.h first before redefining it, eliminating the error
directive.
gcc/ChangeLog:
2021-06-02 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
* config/rs6000/linux.h: Undefine TARGET_RUST_OS_INFO before
defining it.
Fixes #468
Co-authored-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
| -rw-r--r-- | gcc/config/rs6000/linux.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h index 9660d42..acf830f 100644 --- a/gcc/config/rs6000/linux.h +++ b/gcc/config/rs6000/linux.h @@ -59,9 +59,8 @@ } \ while (0) -#ifdef TARGET_RUST_OS_INFO -# error "TARGET_RUST_OS_INFO already defined in linux.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(); \ |