diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-02-03 11:22:10 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-02-03 11:22:10 +0100 |
| commit | 30a1ca44eb6cc1833b876235e3b35c93bbac4065 (patch) | |
| tree | 77385db6bf33121ef3408d9fc1a2945dbc13f5be /mk/vars.mk | |
| parent | d52b56753fd291c95468958ca60362ed94c929d7 (diff) | |
| parent | ac6189bdb83487944130a42df49414a1b94a33fd (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/vars.mk')
| -rw-r--r-- | mk/vars.mk | 11 |
1 files changed, 8 insertions, 3 deletions
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 |