summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-25 13:35:33 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-25 13:36:58 -0600
commit48e41e6921d8817afe9bd6a79f476f34957fbc60 (patch)
tree05f8ba36fe80fca5e2f34d240c9a70616b6328cf /mk
parent8deba1c4a219fea66444eb4335dbb24134da4302 (diff)
m68k specific LDFLAGS
Diffstat (limited to 'mk')
-rw-r--r--mk/vars.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index ec5d89fdb..ba4a29924 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -124,6 +124,7 @@ 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)
@@ -145,11 +146,10 @@ TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float
endif
endif
+ifeq ($(ADK_TARGET_ARCH_M68K),y)
ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
TARGET_LDFLAGS+= -elf2flt
endif
-
-ifeq ($(ADK_TARGET_ARCH_M68K),y)
ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y)
TARGET_CFLAGS+= -msep-data
TARGET_CXXFLAGS+= -msep-data