diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-06 17:03:59 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-06 17:03:59 +0100 |
| commit | 710c7e13df471fe6b5366d4a284d02cd30479cc0 (patch) | |
| tree | cb334404683c9fb03e6baa337749d6663557a88a /toolchain | |
| parent | b42d26ca729134d31887445856c65a85da69fb65 (diff) | |
| parent | 3f8e6e157f3183d1af9ce7933b99ff8b3d5e3c20 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/musl/Makefile | 6 | ||||
| -rw-r--r-- | toolchain/uClibc/Makefile | 36 |
2 files changed, 17 insertions, 25 deletions
diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index d675dc4cc..aa5e8845c 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -15,12 +15,6 @@ endif ifeq ($(CPU_ARCH),mips64) GNU_TARGET_NAME:= $(subst mips64,mips,$(GNU_TARGET_NAME)) endif -ifeq ($(CPU_ARCH),microblazeel) -GNU_TARGET_NAME:= $(subst microblazeel,microblaze,$(GNU_TARGET_NAME)) -endif -ifeq ($(CPU_ARCH),sh4) -GNU_TARGET_NAME:= $(subst sh4,sh,$(GNU_TARGET_NAME)) -endif $(WRKBUILD)/.headers: (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 4ee9af510..b935a2f53 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -14,30 +14,28 @@ ifeq (${ADK_MAKE_PARALLEL},y) UCLIBC_MAKEOPTS+= -j${ADK_MAKE_JOBS} endif -UCLIBCCFG=uclibc.config +$(WRKBUILD)/.headers: + $(SED) 's,^CROSS_COMPILE=.*,CROSS_COMPILE=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak + sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \ + $(TOPDIR)/target/$(ADK_TARGET_ARCH)/uclibc.config >${WRKBUILD}/.config ifeq ($(ADK_TARGET_ENDIAN),little) -ifeq ($(ADK_CPU_MIPS64),y) -UCLIBCCFG=uclibc.config.little.mips64 + $(SED) 's/.*\(ARCH_LITTLE_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config + $(SED) 's/.*\(ARCH_WANTS_LITTLE_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config + $(SED) 's/.*\(ARCH_BIG_ENDIAN\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(ARCH_WANTS_BIG_ENDIAN\).*/# \1 is not set/' ${WRKBUILD}/.config else -UCLIBCCFG=uclibc.config.little + $(SED) 's/.*\(ARCH_BIG_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config + $(SED) 's/.*\(ARCH_WANTS_BIG_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config + $(SED) 's/.*\(ARCH_LITTLE_ENDIAN\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(ARCH_WANTS_LITTLE_ENDIAN\).*/# \1 is not set/' ${WRKBUILD}/.config endif -endif -ifeq ($(ADK_TARGET_ENDIAN),big) -ifeq ($(ADK_CPU_MIPS64),y) -UCLIBCCFG=uclibc.config.big.mips64 +ifeq ($(ADK_LINUX_64),y) + $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/\1=y/' ${WRKBUILD}/.config + $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\).*/# \1 is not set/' ${WRKBUILD}/.config else -UCLIBCCFG=uclibc.config.big -endif + $(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_TARGET_SYSTEM_LEMOTE_YEELONG),y) -UCLIBCCFG=uclibc.config.little.mips64 -endif - -$(WRKBUILD)/.headers: - $(SED) 's,^CROSS_COMPILE=.*,CROSS_COMPILE=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak - sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \ - $(TOPDIR)/target/$(ADK_TARGET_ARCH)/$(UCLIBCCFG) >${WRKBUILD}/.config ifeq ($(ADK_TARGET_ABI_N64),y) $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config |