Browse Source

cleanup binfmt flat handling, reduce duplicates

Waldemar Brodkorb 8 years ago
parent
commit
fca65756b8
2 changed files with 5 additions and 27 deletions
  1. 2 24
      mk/vars.mk
  2. 3 3
      toolchain/Makefile

+ 2 - 24
mk/vars.mk

@@ -163,42 +163,20 @@ 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
-TARGET_CXXFLAGS+=	-Wl,-elf2flt
-endif
-endif
-
-ifeq ($(ADK_TARGET_ARCH_BFIN),y)
-ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
-TARGET_CFLAGS+=		-Wl,-elf2flt
-TARGET_CXXFLAGS+=	-Wl,-elf2flt
-endif
-ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y)
-TARGET_CFLAGS+=		-msep-data
-TARGET_CXXFLAGS+=	-msep-data
-endif
-endif
-
 ifeq ($(ADK_TARGET_ARCH_H8300),y)
 TARGET_CFLAGS+=		-mh
 TARGET_LDFLAGS+=	-mh
+endif
+
 ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
 TARGET_CFLAGS+=		-Wl,-elf2flt
 TARGET_CXXFLAGS+=	-Wl,-elf2flt
 endif
-endif
 
-ifeq ($(ADK_TARGET_ARCH_M68K),y)
-ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
-TARGET_LDFLAGS+=	-elf2flt
-endif
 ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y)
 TARGET_CFLAGS+=		-msep-data
 TARGET_CXXFLAGS+=	-msep-data
 endif
-endif
 
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
 # use -static-libgcc by default only for musl

+ 3 - 3
toolchain/Makefile

@@ -36,7 +36,7 @@ TARGETS+=elf2flt
 ELF2FLT:=elf2flt-install
 endif
 
-# disable gdb for arc
+# disable gdb for some architectures
 ifeq ($(ADK_TARGET_ARCH_ARC)$(ADK_TARGET_ARCH_METAG)$(ADK_TARGET_ARCH_OR1K),)
 TARGETS+=gdb
 GDB:=gdb-install
@@ -57,8 +57,8 @@ final: $(FINAL)
 
 gcc-configure: binutils-install gmp-install mpfr-install mpc-install libelf-install
 $(CLIB)-install: gcc-configure kernel-headers-configure
-gcc-install: $(CLIB)-install
-gcc-final: gcc-install $(GDB) $(ELF2FLT)
+gcc-install: $(ELF2FLT) $(CLIB)-install
+gcc-final: gcc-install $(GDB)
 
 %-download:
 	$(TRACE) toolchain/$(patsubst %-download,%,$@)/download