![Romain Naour](/assets/img/avatar_default.png)
GCC 10 now enable by default -ftree-loop-distribute-patterns at -O2 or -Os optimization level instead of -O3, see commit [1]. Due to this change, the microblaze kernel doesn't boot (as reported by toolchain-builder project). The gcc docs between version 9 and 10 has been updated accordingly [2] [3] but there no word about this change in the gcc 10 changelog [4]. Fixes microblazebe: https://gitlab.com/bootlin/toolchains-builder/-/jobs/729359536 (glibc) https://gitlab.com/bootlin/toolchains-builder/-/jobs/729359538 (musl) https://gitlab.com/bootlin/toolchains-builder/-/jobs/729359540 (uClubc-ng) Fixes microblazeel: https://gitlab.com/bootlin/toolchains-builder/-/jobs/729359542 (glibc) https://gitlab.com/bootlin/toolchains-builder/-/jobs/729359544 (musl) https://gitlab.com/bootlin/toolchains-builder/-/jobs/729359546 (uClibc-ng) This has been reported upsteam [5]. [1] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=5879ab5fafedc8f6f9bfe95a4cf8501b0df90edd [2] https://gcc.gnu.org/onlinedocs/gcc-9.3.0/gcc/Optimize-Options.html#Optimize-Options [3] https://gcc.gnu.org/onlinedocs/gcc-10.2.0/gcc/Optimize-Options.html#Optimize-Options [4] https://gcc.gnu.org/gcc-10/changes.html [5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97208 Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
93 lines
2.9 KiB
Makefile
93 lines
2.9 KiB
Makefile
################################################################################
|
|
#
|
|
# definition of the toolchain wrapper build commands
|
|
#
|
|
################################################################################
|
|
|
|
# We use --hash-style=both to increase the compatibility of the generated
|
|
# binary with older platforms, except for MIPS, where the only acceptable
|
|
# hash style is 'sysv'
|
|
ifeq ($(findstring mips,$(HOSTARCH)),mips)
|
|
TOOLCHAIN_WRAPPER_HASH_STYLE = sysv
|
|
else
|
|
TOOLCHAIN_WRAPPER_HASH_STYLE = both
|
|
endif
|
|
|
|
TOOLCHAIN_WRAPPER_ARGS = $($(PKG)_TOOLCHAIN_WRAPPER_ARGS)
|
|
TOOLCHAIN_WRAPPER_ARGS += -DBR_SYSROOT='"$(STAGING_SUBDIR)"'
|
|
|
|
TOOLCHAIN_WRAPPER_OPTS = \
|
|
$(ARCH_TOOLCHAIN_WRAPPER_OPTS) \
|
|
$(call qstrip,$(BR2_SSP_OPTION)) \
|
|
$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
|
|
|
|
ifeq ($(BR2_REPRODUCIBLE),y)
|
|
TOOLCHAIN_WRAPPER_OPTS += -Wl,--build-id=none
|
|
ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y)
|
|
TOOLCHAIN_WRAPPER_OPTS += -ffile-prefix-map=$(BASE_DIR)=buildroot
|
|
else
|
|
TOOLCHAIN_WRAPPER_OPTS += -D__FILE__=\"\" -D__BASE_FILE__=\"\" -Wno-builtin-macro-redefined
|
|
endif
|
|
ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),)
|
|
TOOLCHAIN_WRAPPER_OPTS += -DBR_NEED_SOURCE_DATE_EPOCH
|
|
endif
|
|
endif
|
|
|
|
# Disable -ftree-loop-distribute-patterns on microblaze to
|
|
# workaround a compiler bug with gcc 10 and -O2, -Os or -O3.
|
|
# https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=5879ab5fafedc8f6f9bfe95a4cf8501b0df90edd
|
|
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97208
|
|
ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10)$(BR2_microblaze),yy)
|
|
TOOLCHAIN_WRAPPER_OPTS += -fno-tree-loop-distribute-patterns
|
|
endif
|
|
|
|
# We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each flag is a
|
|
# separate argument when used in execv() by the toolchain wrapper.
|
|
TOOLCHAIN_WRAPPER_ARGS += \
|
|
-DBR_ADDITIONAL_CFLAGS='$(foreach f,$(TOOLCHAIN_WRAPPER_OPTS),"$(f)"$(comma))'
|
|
|
|
ifeq ($(BR2_CCACHE),y)
|
|
TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE
|
|
endif
|
|
|
|
ifeq ($(BR2_x86_x1000),y)
|
|
TOOLCHAIN_WRAPPER_ARGS += -DBR_OMIT_LOCK_PREFIX
|
|
endif
|
|
|
|
# Avoid FPU bug on XBurst CPUs
|
|
ifeq ($(BR2_mips_xburst),y)
|
|
# Before gcc 4.6, -mno-fused-madd was needed, after -ffp-contract is
|
|
# needed
|
|
ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_6),y)
|
|
TOOLCHAIN_WRAPPER_ARGS += -DBR_FP_CONTRACT_OFF
|
|
else
|
|
TOOLCHAIN_WRAPPER_ARGS += -DBR_NO_FUSED_MADD
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(BR2_CCACHE_USE_BASEDIR),y)
|
|
TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"'
|
|
endif
|
|
|
|
ifeq ($(BR2_PIC_PIE),y)
|
|
TOOLCHAIN_WRAPPER_ARGS += -DBR2_PIC_PIE
|
|
endif
|
|
|
|
ifeq ($(BR2_RELRO_PARTIAL),y)
|
|
TOOLCHAIN_WRAPPER_ARGS += -DBR2_RELRO_PARTIAL
|
|
else ifeq ($(BR2_RELRO_FULL),y)
|
|
TOOLCHAIN_WRAPPER_ARGS += -DBR2_RELRO_FULL
|
|
endif
|
|
|
|
define TOOLCHAIN_WRAPPER_BUILD
|
|
$(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \
|
|
-s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \
|
|
toolchain/toolchain-wrapper.c \
|
|
-o $(@D)/toolchain-wrapper
|
|
endef
|
|
|
|
define TOOLCHAIN_WRAPPER_INSTALL
|
|
$(INSTALL) -D -m 0755 $(@D)/toolchain-wrapper \
|
|
$(HOST_DIR)/bin/toolchain-wrapper
|
|
endef
|