From 94cf042086622a7387f35244d8d8e5b79ee0d0c9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 10 Jun 2015 08:19:33 -0500 Subject: [PATCH] add some h8/300 fixes --- mk/vars.mk | 1 + target/config/Config.in.gcc.choice | 1 + target/config/Config.in.kernel | 2 +- target/h8300/systems/sim-h8300h | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/vars.mk b/mk/vars.mk index 68953e14d..170580396 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -176,6 +176,7 @@ endif endif ifeq ($(ADK_TARGET_ARCH_H8300),y) +TARGET_CFLAGS+= -mh ifeq ($(ADK_TARGET_BINFMT_FLAT),y) TARGET_CFLAGS+= -Wl,-elf2flt TARGET_CXXFLAGS+= -Wl,-elf2flt diff --git a/target/config/Config.in.gcc.choice b/target/config/Config.in.gcc.choice index 3583b9d84..347b05859 100644 --- a/target/config/Config.in.gcc.choice +++ b/target/config/Config.in.gcc.choice @@ -13,6 +13,7 @@ config ADK_TOOLCHAIN_GCC_GIT bool "git" depends on !ADK_TARGET_ARCH_ARC depends on !ADK_TARGET_ARCH_AVR32 + select ADK_DISABLE_HONOUR_CFLAGS config ADK_TOOLCHAIN_GCC_5_1_0 bool "5.1.0" diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel index 4d81617d1..decd0cba4 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernel @@ -79,4 +79,4 @@ config ADK_TARGET_KERNEL_MINICONFIG default "xilinx-kintex7" if ADK_TARGET_SYSTEM_XILINX_KINTEX7 default "pcengines-alix" if ADK_TARGET_SYSTEM_PCENGINES_ALIX default "sim-bfin" if ADK_TARGET_SYSTEM_SIM_BFIN - default "sim-h8300" if ADK_TARGET_SYSTEM_SIM_H8300 + default "sim-h8300h" if ADK_TARGET_SYSTEM_SIM_H8300H diff --git a/target/h8300/systems/sim-h8300h b/target/h8300/systems/sim-h8300h index 2ff18a514..8583f4581 100644 --- a/target/h8300/systems/sim-h8300h +++ b/target/h8300/systems/sim-h8300h @@ -1,7 +1,6 @@ config ADK_TARGET_SYSTEM_SIM_H8300H bool "Simulator" select ADK_CPU_H8300 - select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help H8/300 simulator. -- 2.11.4.GIT