diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/binutils/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 18 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 19 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 10 | ||||
| -rw-r--r-- | toolchain/uclibc/Makefile | 10 |
6 files changed, 35 insertions, 30 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile index 096c427ba..f80a3359e 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -39,8 +39,8 @@ TARGETS+=elf2flt ELF2FLT:=elf2flt-install endif -# disable gdb for arc -ifeq ($(ADK_LINUX_ARC)$(ADK_LINUX_AVR32),) +# disable gdb for arc and avr32 +ifeq ($(ADK_TARGET_ARCH_ARC)$(ADK_TARGET_ARCH_AVR32),) TARGETS+=gdb GDB:=gdb-install endif diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index dbf21f3b3..adaf4cba6 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -28,7 +28,7 @@ ifneq ($(ADK_LINUX_64)$(ADK_TARGET_KERNEL_64),) CONFOPTS+= --enable-64-bit-bfd endif -ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64),) +ifeq ($(ADK_TARGET_ARCH_SH)$(ADK_TARGET_ARCH_X86_64),) CONFOPTS+= --disable-multilib else CONFOPTS+= --enable-multilib @@ -44,7 +44,7 @@ endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: -ifeq ($(ADK_LINUX_XTENSA),y) +ifeq ($(ADK_TARGET_ARCH_XTENSA),y) tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_XTENSA).tar \ --strip-components=1 -C $(WRKSRC) binutils endif diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index ccf0b4b69..a3f9a03af 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -11,7 +11,7 @@ TARGET_CFLAGS:= $(filter-out -fstack-protector-all,$(TARGET_CFLAGS)) TARGET_CXXFLAGS:= $(filter-out -fstack-protector-all,$(TARGET_CXXFLAGS)) endif -ifeq ($(ADK_LINUX_XTENSA),y) +ifeq ($(ADK_TARGET_ARCH_XTENSA),y) TARGET_CFLAGS:= $(filter-out -mtext-section-literals,$(TARGET_CFLAGS)) TARGET_CXXFLAGS:= $(filter-out -mtext-section-literals,$(TARGET_CXXFLAGS)) endif @@ -70,11 +70,11 @@ GCC_FINAL_CONFOPTS+= --enable-shared='libstdc++,libgcc' endif endif -ifeq ($(ADK_LINUX_M68K)$(ADK_LINUX_SH)$(ADK_LINUX_X86_64)$(ADK_LINUX_X86),) +ifeq ($(ADK_TARGET_ARCH_M68K)$(ADK_TARGET_ARCH_SH)$(ADK_TARGET_ARCH_X86_64)$(ADK_TARGET_ARCH_X86),) GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib endif -ifeq ($(ADK_LINUX_SH),y) +ifeq ($(ADK_TARGET_ARCH_SH),y) ifeq ($(ADK_little),y) GCC_CONFOPTS+= --with-endian=little else @@ -83,7 +83,7 @@ endif GCC_FINAL_CONFOPTS+= --enable-multilib --with-multilib-list=m4,m4-nofpu endif -ifeq ($(ADK_LINUX_X86),y) +ifeq ($(ADK_TARGET_ARCH_X86),y) ifeq ($(ADK_TARGET_KERNEL_64),y) GCC_FINAL_CONFOPTS+= --enable-biarch --enable-targets=all --disable-multilib else @@ -91,7 +91,7 @@ GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib endif endif -ifeq ($(ADK_LINUX_X86_64),y) +ifeq ($(ADK_TARGET_ARCH_X86_64),y) ifeq ($(ADK_x32),y) GCC_FINAL_CONFOPTS+= --with-abi=x32 endif @@ -112,14 +112,14 @@ else GCC_CONFOPTS+= --disable-lto endif -ifeq ($(ADK_LINUX_PPC),y) +ifeq ($(ADK_TARGET_ARCH_PPC),y) GCC_CONFOPTS+= --with-long-double-64 --enable-secureplt ifneq ($(ADK_TARGET_CPU_WITH_FPU),y) GCC_CONFOPTS+= --with-float=soft endif endif -ifeq ($(ADK_TARGET_ARCH),arm) +ifeq ($(ADK_TARGET_ARCH_ARM),y) GCC_CONFOPTS+= --with-float=$(ADK_TARGET_FLOAT) ifneq ($(ADK_TARGET_FPU),) GCC_CONFOPTS+= --with-fpu=$(ADK_TARGET_FPU) @@ -175,7 +175,7 @@ GCC_BUILD_DIR_INITIAL:= $(WRKBUILD)-initial GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final $(GCC_BUILD_DIR_MINIMAL)/.configured: -ifeq ($(ADK_LINUX_XTENSA),y) +ifeq ($(ADK_TARGET_ARCH_XTENSA),y) tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_XTENSA).tar \ --strip-components=1 -C $(WRKSRC) gcc endif @@ -188,7 +188,7 @@ endif rm -rf ${TOOLCHAIN_DIR}/usr/$(GNU_TARGET_NAME)/lib (cd $(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME); \ ln -s ../$(STAGING_HOST2TARGET)/lib lib) -ifeq ($(ADK_LINUX_SH),y) +ifeq ($(ADK_TARGET_ARCH_SH),y) (cd ${STAGING_TARGET_DIR}/ && ln -sf . m4 && ln -sf . m4-nofpu) endif $(SED) '/k prot/agcc_cv_libc_provides_ssp=yes' $(WRKBUILD)/gcc/configure diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index d13822b6e..5c39a343c 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -3,10 +3,10 @@ include $(ADK_TOPDIR)/rules.mk include ../rules.mk -include ${ADK_TOPDIR}/mk/kernel-ver.mk +include $(ADK_TOPDIR)/mk/kernel-ver.mk include $(ADK_TOPDIR)/mk/linux.mk -include ${ADK_TOPDIR}/mk/kernel-vars.mk -include ${ADK_TOPDIR}/mk/buildhlp.mk +include $(ADK_TOPDIR)/mk/kernel-vars.mk +include $(ADK_TOPDIR)/mk/buildhlp.mk $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched: ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_APU),y) @@ -16,7 +16,7 @@ ifeq ($(ADK_KERNEL_ROOT_NFS),y) --strip-components=2 -C $(WRKSRC)/firmware realtek-firmware-1.1 endif endif -ifeq ($(ADK_LINUX_XTENSA),y) +ifeq ($(ADK_TARGET_ARCH_XTENSA),y) tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_dc232b.tar \ --strip-components=1 -C $(WRKSRC) linux endif @@ -50,14 +50,19 @@ ifeq ($(ADK_KERNEL_ADDON_MPTCP),y) $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ $(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-mptcp $(MAKE_TRACE) endif +ifeq ($(ADK_KERNEL_ADDON_DIETNET),y) + $(TRACE) dietnet-kernel-patch + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ + $(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-dietnet $(MAKE_TRACE) +endif touch $@ $(WRKBUILD)/.headers: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched - ${KERNEL_MAKE_ENV} $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} headers_check - ${KERNEL_MAKE_ENV} $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} \ + $(KERNEL_MAKE_ENV) $(MAKE) -C $(WRKBUILD) $(KERNEL_MAKE_OPTS) headers_check + $(KERNEL_MAKE_ENV) $(MAKE) -C $(WRKBUILD) $(KERNEL_MAKE_OPTS) \ INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \ headers_install -ifeq ($(ADK_TARGET_ARCH),cris) +ifeq ($(ADK_TARGET_ARCH_CRIS),y) ifeq ($(ADK_TARGET_CPU_ARCH),crisv32) cd $(STAGING_TARGET_DIR)/usr/include && ln -sf arch-v32/arch arch else diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index f1c7cc83f..39d96e2d9 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -52,7 +52,7 @@ endif # architecture specific options # arm -ifeq ($(ADK_LINUX_ARM),y) +ifeq ($(ADK_TARGET_ARCH_ARM),y) ifeq ($(ADK_TARGET_ABI_EABI),y) $(SED) 's/.*\(UCLIBC_HAS_FPU\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_SOFT_FLOAT\).*/#\1=y/' ${WRKBUILD}/.config @@ -67,15 +67,15 @@ ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y) endif endif # mips/mips64 -ifeq ($(ADK_LINUX_MIPS64),y) +ifeq ($(ADK_TARGET_ARCH_MIPS64),y) $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\).*/# \1 is not set/' ${WRKBUILD}/.config endif -ifeq ($(ADK_LINUX_MIPS),y) +ifeq ($(ADK_TARGET_ARCH_MIPS),y) $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/# \1 is not set/' ${WRKBUILD}/.config endif -ifeq ($(ADK_LINUX_MIPS64),y) +ifeq ($(ADK_TARGET_ARCH_MIPS64),y) ifeq ($(ADK_n64),y) $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config @@ -93,7 +93,7 @@ ifeq ($(ADK_o32),y) endif endif # powerpc -ifeq ($(ADK_LINUX_PPC),y) +ifeq ($(ADK_TARGET_ARCH_PPC),y) ifeq ($(ADK_TARGET_CPU_WITH_FPU),y) $(SED) 's/.*\(UCLIBC_HAS_FPU\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_SOFT_FLOAT\).*/# \1 is not set/' ${WRKBUILD}/.config diff --git a/toolchain/uclibc/Makefile b/toolchain/uclibc/Makefile index c13ff9cc9..fd4427377 100644 --- a/toolchain/uclibc/Makefile +++ b/toolchain/uclibc/Makefile @@ -53,7 +53,7 @@ endif # architecture specific options # arm -ifeq ($(ADK_LINUX_ARM),y) +ifeq ($(ADK_TARGET_ARCH_ARM),y) ifeq ($(ADK_TARGET_ABI_EABI),y) $(SED) 's/.*\(UCLIBC_HAS_FPU\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_SOFT_FLOAT\).*/#\1=y/' ${WRKBUILD}/.config @@ -68,15 +68,15 @@ ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y) endif endif # mips/mips64 -ifeq ($(ADK_LINUX_MIPS64),y) +ifeq ($(ADK_TARGET_ARCH_MIPS64),y) $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\).*/# \1 is not set/' ${WRKBUILD}/.config endif -ifeq ($(ADK_LINUX_MIPS),y) +ifeq ($(ADK_TARGET_ARCH_MIPS),y) $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/# \1 is not set/' ${WRKBUILD}/.config endif -ifeq ($(ADK_LINUX_MIPS64),y) +ifeq ($(ADK_TARGET_ARCH_MIPS64),y) ifeq ($(ADK_n64),y) $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config @@ -94,7 +94,7 @@ ifeq ($(ADK_o32),y) endif endif # powerpc -ifeq ($(ADK_LINUX_PPC),y) +ifeq ($(ADK_TARGET_ARCH_PPC),y) ifeq ($(ADK_TARGET_CPU_WITH_FPU),y) $(SED) 's/.*\(UCLIBC_HAS_FPU\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_SOFT_FLOAT\).*/# \1 is not set/' ${WRKBUILD}/.config |