2 files changed, 1 insertions, 2 deletions

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 093361e2298c..bb80d3ea82fd 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -113,6 +113,7 @@ config ARCH_RV32I
 config ARCH_RV64I
         bool "RV64I"
         select 64BIT
+        select ARCH_SUPPORTS_INT128 if GCC_VERSION >= 50000
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_FTRACE_MCOUNT_RECORD
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index 61ec42405ec9..33700e4bfc3b 100644
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -25,8 +25,6 @@ ifeq ($(CONFIG_ARCH_RV64I),y)
 
         KBUILD_CFLAGS += -mabi=lp64
         KBUILD_AFLAGS += -mabi=lp64
-        
-        KBUILD_CFLAGS   += $(call cc-ifversion, -ge, 0500, -DCONFIG_ARCH_SUPPORTS_INT128)
 
         KBUILD_MARCH = rv64im
         KBUILD_LDFLAGS += -melf64lriscv