From aa419b2a267620647212a1616fad2b499f5fb6c6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 2 Feb 2015 23:34:37 -0600
Subject: add some fixes and inrastructure for arm nommu support

---
 mk/vars.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'mk/vars.mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index 7fe962d94..ec039b234 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -80,11 +80,14 @@ endif
 # target tools
 TARGET_CC:=		${TARGET_COMPILER_PREFIX}gcc
 
-# use a gcc wrapper for coldfire support
+# use a gcc wrapper for coldfire/arm uclinux support
 ifeq ($(ADK_TARGET_UCLINUX),y)
 ifeq ($(ADK_TARGET_ARCH_M68K),y)
 TARGET_CC:=		adk-uclinux-gcc
 endif
+ifeq ($(ADK_TARGET_ARCH_ARM),y)
+TARGET_CC:=		adk-uclinux-gcc
+endif
 endif
 
 TARGET_CXX:=		${TARGET_COMPILER_PREFIX}g++
@@ -105,8 +108,10 @@ TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib
 
 ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
+ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y)
 TARGET_CFLAGS+=		-msep-data
 TARGET_CXXFLAGS+=	-msep-data
+endif
 TARGET_LDFLAGS+=	-elf2flt
 endif
 
@@ -193,8 +198,8 @@ endif
 
 ifeq ($(ADK_TARGET_ARCH_ARM),y)
 ifeq ($(ADK_TARGET_ARCH_ARM_WITH_THUMB),y)
-TARGET_CFLAGS+=		-mthumb
-TARGET_CXXFLAGS+=	-mthumb
+TARGET_CFLAGS+=		-mthumb -Wa,-mimplicit-it=thumb
+TARGET_CXXFLAGS+=	-mthumb -Wa,-mimplicit-it=thumb
 else
 TARGET_CFLAGS+=		-marm
 TARGET_CXXFLAGS+=	-marm
-- 
cgit v1.2.3