diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 6e725ba1081..ba7dd99672a 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -23,9 +23,12 @@ endif
 
 PLATFORM_RELFLAGS += -fno-common $(FIXED_REG)
 PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \
-		     $(call cc-option,-mgeneral-regs-only) \
       $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
 
+ifeq ($(CONFIG_ARM64),y)
+PLATFORM_RELFLAGS += $(call cc-option,-mgeneral-regs-only)
+endif
+
 # LLVM support
 LLVM_RELFLAGS		:= $(call cc-option,-mllvm,) \
 			$(call cc-option,-mno-movt,)