|
@@ -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
|