diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-04 13:07:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-04 13:07:44 +0000 |
| commit | 1f1d9ed87d3e870f8e64ea28ba3e6bc898502255 (patch) | |
| tree | 4ff49bcc8a812111c1d62201934546084396adfd | |
| parent | f408033d52dcb3069ccc1b4ce5d467505abe9090 (diff) | |
| parent | c1728c27cbbaebdc890b603519da9e645489393a (diff) | |
| download | gcc-1f1d9ed87d3e870f8e64ea28ba3e6bc898502255.zip gcc-1f1d9ed87d3e870f8e64ea28ba3e6bc898502255.tar.gz gcc-1f1d9ed87d3e870f8e64ea28ba3e6bc898502255.tar.bz2 | |
Merge #482
482: arm: Override TARGET_RUST_OS_INFO in bpabi.h r=tschwinge a=glaubitz
Similar to PowerPC, 32-bit ARM has the issue that TARGET_RUST_OS_INFO
is defined in two separate headers, namely config/arm/bpabi.h and
config/arm/linux-elf.h. We can apply the same fix that was already
used for PowerPC.
gcc/ChangeLog:
2021-06-04 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
* config/arm/bpabi.h: Undefine TARGET_RUST_OS_INFO before
defining it.
Co-authored-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
| -rw-r--r-- | gcc/config/arm/bpabi.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/config/arm/bpabi.h b/gcc/config/arm/bpabi.h index 2c3e92f..14043b3 100644 --- a/gcc/config/arm/bpabi.h +++ b/gcc/config/arm/bpabi.h @@ -109,9 +109,8 @@ /*TODO: is this even an OS? What should go here?*/ \ } while (0) -#ifdef TARGET_RUST_OS_INFO -# error "TARGET_RUST_OS_INFO already defined in bpabi.h - c++ undefines it and redefines it." -#endif +/* Override less-specific arm/linux-elf.h definition. */ +#undef TARGET_RUST_OS_INFO #define TARGET_RUST_OS_INFO() \ BPABI_TARGET_RUST_OS_INFO() |