diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-04 07:29:03 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-04 07:29:47 +0100 |
| commit | fca65756b82cb99344805a840a6e2d59da1a8ed8 (patch) | |
| tree | 1de92825e2aa4f97cbf498b9ffb620b0f8c463ae | |
| parent | 450c3efcb0b0b7541074c457d0a44a574b018fb7 (diff) | |
cleanup binfmt flat handling, reduce duplicates
| -rw-r--r-- | mk/vars.mk | 26 | ||||
| -rw-r--r-- | toolchain/Makefile | 6 |
2 files changed, 5 insertions, 27 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 29826cf5b..5493b377a 100644 --- a/mk/vars.mk +++ b/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 diff --git a/toolchain/Makefile b/toolchain/Makefile index 088f563e3..b1c24f78c 100644 --- a/toolchain/Makefile +++ b/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 |