From 0d5476f287f4f5c0a74c4f5b42025dfe0ce3b253 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 25 Feb 2015 14:09:55 -0600
Subject: use elf2flt CFLAGS for ARM with BINFMT_FLAT

---
 mk/vars.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'mk/vars.mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index ba4a29924..563806b44 100644
--- a/mk/vars.mk
+++ b/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
-- 
cgit v1.2.3