diff options
| -rw-r--r-- | target/config/Config.in.binfmt | 2 | ||||
| -rw-r--r-- | toolchain/binutils/Makefile | 6 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt index 336b0b8b0..7567b07bc 100644 --- a/target/config/Config.in.binfmt +++ b/target/config/Config.in.binfmt @@ -18,7 +18,7 @@ config ADK_TARGET_BINFMT_FLAT config ADK_TARGET_BINFMT_FDPIC bool "FDPIC" - depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV || ADK_TARGET_CPU_SH_J2 + depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV || ADK_TARGET_ARCH_SH config ADK_TARGET_BINFMT_DSBT bool "DSBT" diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 8f5adc393..a844388cc 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -43,7 +43,9 @@ ifeq ($(ADK_TARGET_ARCH_XTENSA),y) tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_CPU_TYPE).tar \ --strip-components=1 -C $(WRKSRC) binutils endif - (cd $(WRKBUILD); PATH='$(HOST_PATH)' MAKEINFO=true \ + (cd $(WRKBUILD); PATH='$(HOST_PATH)' \ + MAKEINFO=true \ + M4='${STAGING_HOST_DIR}/usr/bin/m4' \ $(WRKBUILD)/configure \ --prefix=$(TOOLCHAIN_DIR)/usr \ --target=$(GNU_TARGET_NAME) \ @@ -66,7 +68,7 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled PATH='$(HOST_PATH)' $(MAKE) MAKEINFO=true -C $(WRKBUILD) install -ifeq ($(ADK_TARGET_ARCH_H8300)$(ADK_TARGET_ARCH_NDS32)$(ADK_TARGET_CPU_SH_J2),y) +ifeq ($(ADK_TARGET_ARCH_H8300)$(ADK_TARGET_ARCH_NDS32)$(ADK_TARGET_ARCH_SH),y) $(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/lib/ldscripts $(CP) $(WRKBUILD)/ld/ldscripts/* $(STAGING_TARGET_DIR)/usr/lib/ldscripts/ endif diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 3d01510b1..8f8cacd8f 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -140,7 +140,7 @@ GCC_CONFOPTS+= --with-endian=little else GCC_CONFOPTS+= --with-endian=big endif -ifeq ($(ADK_TARGET_CPU_SH_J2),y) +ifeq ($(ADK_TARGET_ARCH_SH),y) ifeq ($(ADK_TARGET_BINFMT_FDPIC),y) GCC_CONFOPTS+= --enable-fdpic endif |