瀏覽代碼

sh: allow to build fdpic toolchain for pure sh architecture

Waldemar Brodkorb 7 年之前
父節點
當前提交
13c9428fc4
共有 3 個文件被更改,包括 6 次插入4 次删除
  1. 1 1
      target/config/Config.in.binfmt
  2. 4 2
      toolchain/binutils/Makefile
  3. 1 1
      toolchain/gcc/Makefile

+ 1 - 1
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"

+ 4 - 2
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

+ 1 - 1
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