use elf2flt CFLAGS for ARM with BINFMT_FLAT

mk/vars.mk

@@ -124,7 +124,6 @@ TARGET_CFLAGS+=		-march=$(ADK_TARGET_GCC_ARCH)
 TARGET_CXXFLAGS+=	-march=$(ADK_TARGET_GCC_ARCH)
 endif
 
-<<<<<<< HEAD
 ifneq ($(ADK_TARGET_CPU_FLAGS),)
 TARGET_CFLAGS+=		$(ADK_TARGET_CPU_FLAGS)
 TARGET_CXXFLAGS+=	$(ADK_TARGET_CPU_FLAGS)
@@ -146,6 +145,12 @@ TARGET_CXXFLAGS+=	-m$(ADK_TARGET_FLOAT)-float
 endif
 endif
 
+ifeq ($(ADK_TARGET_ARCH_ARM),y)
+ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
+TARGET_CFLAGS+=		-Wl,-elf2flt
+endif
+endif
+
 ifeq ($(ADK_TARGET_ARCH_M68K),y)
 ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
 TARGET_LDFLAGS+=	-elf2flt