architecture: drop __riscv__ checks, it's obsolete since 2018

diff --git a/src/basic/architecture.c b/src/basic/architecture.c
index e5dafb98141e59aa0632ff94381095def1f5d251..4f5c5b86a69ccff72f988abdeb2d08fba1155e2a 100644 (file)
--- 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 9abc1831da6425b2f65981b6704fc1f95000b7f3..2126c79898db0c1d6f2140e153a4533e873e68ff 100644 (file)
--- 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"