From a5d2b1c8ab83b23476b6e7979641cb3f158268ad Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 24 Apr 2016 12:27:56 +0200 Subject: m68k: remove gcc wrapper We don't need the gcc wrapper when some object files removed from libgcc.a. Idea from uClinux-toolchain build script. Fix some issues with shared flat, still no bootup. For msep-data DOPIC is used, for one-region flat DOPIC must be disabled. So both tested and working. --- toolchain/uclibc-ng/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'toolchain/uclibc-ng/Makefile') diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 2e6cde204..80b6e1b28 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -69,18 +69,22 @@ ifeq ($(ADK_TARGET_BINFMT_FDPIC),y) endif ifeq ($(ADK_TARGET_BINFMT_FLAT),y) ifeq ($(ADK_TARGET_BINFMT_FLAT_ONE),y) + echo '# UCLIBC_FORMAT_FLAT is not set' >> ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_FLAT\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_FLAT_SEP_DATA\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_SHARED_FLAT\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_FDPIC_ELF\).*/# \1 is not set/' ${WRKBUILD}/.config endif ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y) + echo '# UCLIBC_FORMAT_FLAT_SEP_DATA is not set' >> ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_FLAT_SEP_DATA\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_FLAT \).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_SHARED_FLAT\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_FDPIC_ELF\).*/# \1 is not set/' ${WRKBUILD}/.config endif ifeq ($(ADK_TARGET_BINFMT_FLAT_SHARED),y) + echo '# UCLIBC_FORMAT_SHARED_FLAT is not set' >> ${WRKBUILD}/.config + echo '# HAVE_NO_SHARED is not set' >> ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_SHARED_FLAT\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_FLAT \).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_FORMAT_FLAT_SEP_DATA\).*/# \1 is not set/' ${WRKBUILD}/.config @@ -240,9 +244,11 @@ endif ifeq ($(ADK_TARGET_ARCH_M68K),y) ifeq ($(ADK_TARGET_WITHOUT_MMU),y) +ifeq ($(ADK_TARGET_BINFMT_FLAT_ONE)$(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y) $(SED) 's/.*\(DOPIC\).*/# \1 is not set/' ${WRKBUILD}/.config endif endif +endif # mips64 abi ifeq ($(ADK_TARGET_ARCH_MIPS64),y) -- cgit v1.2.3