From 3299c293db68a49eb6d654c76a3eda91cec74ff6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 10 Nov 2021 12:25:03 +0100 Subject: [PATCH] architecture: drop __riscv__ checks, it's obsolete since 2018 --- src/basic/architecture.c | 3 +-- src/basic/architecture.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/basic/architecture.c b/src/basic/architecture.c index e5dafb98141..4f5c5b86a69 100644 --- a/src/basic/architecture.c +++ b/src/basic/architecture.c @@ -106,8 +106,7 @@ int uname_architecture(void) { { "crisv32", ARCHITECTURE_CRIS }, #elif defined(__nios2__) { "nios2", ARCHITECTURE_NIOS2 }, -#elif defined(__riscv__) || defined(__riscv) - /* __riscv__ is obsolete, remove in 2018 */ +#elif defined(__riscv) { "riscv32", ARCHITECTURE_RISCV32 }, { "riscv64", ARCHITECTURE_RISCV64 }, # if __SIZEOF_POINTER__ == 4 diff --git a/src/basic/architecture.h b/src/basic/architecture.h index 9abc1831da6..2126c79898d 100644 --- a/src/basic/architecture.h +++ b/src/basic/architecture.h @@ -210,8 +210,7 @@ int uname_architecture(void); #elif defined(__nios2__) # define native_architecture() ARCHITECTURE_NIOS2 # define LIB_ARCH_TUPLE "nios2-linux-gnu" -#elif defined(__riscv__) || defined(__riscv) - /* __riscv__ is obsolete, remove in 2018 */ +#elif defined(__riscv) # if __SIZEOF_POINTER__ == 4 # define native_architecture() ARCHITECTURE_RISCV32 # define LIB_ARCH_TUPLE "riscv32-linux-gnu" -- 2.47.3