diff options
author | John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> | 2021-06-04 11:04:05 +0000 |
---|---|---|
committer | John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> | 2021-06-04 11:07:08 +0000 |
commit | c1728c27cbbaebdc890b603519da9e645489393a (patch) | |
tree | 9c4e82150056011287f8865d4821b921b8b46fbe | |
parent | ff4715d79e2c17d270db8b94315aa6b574f48994 (diff) | |
download | gcc-c1728c27cbbaebdc890b603519da9e645489393a.zip gcc-c1728c27cbbaebdc890b603519da9e645489393a.tar.gz gcc-c1728c27cbbaebdc890b603519da9e645489393a.tar.bz2 |
arm: Override TARGET_RUST_OS_INFO in bpabi.h
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.
-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() |