Commit 3e044040 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

toolchain/external: fix building the wrapper on MIPS 



Some crazy folks use MIPS machines as build machines. ;-)

On MIPS, the only acceptable hash-style is 'sysv', because the MIPS ABI
defines that the GOT ordering to be the same as the symbols ordering,
while GNU hash requires symbols to be sorted by their hash.

Looking at binutils' code, it seems that only MIPS suffers from that
limitation.

Currently, we force the toolchain wrapper to be linked with both hash
styles, which breaks on MIPS.

So, fix that by singling out MIPS, and use sysv in that case, and both
otherwise.

Reported-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 30362526

toolchain/toolchain-external/toolchain-external.mk

+11 −3
Original line number Diff line number Diff line
@@ -625,6 +625,15 @@ define TOOLCHAIN_EXTERNAL_INSTALL_BFIN_FLAT 
endef

endif



# 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_EXTERNAL_WRAPPER_HASH_STYLE = sysv

else

TOOLCHAIN_EXTERNAL_WRAPPER_HASH_STYLE = both

endif



# Build toolchain wrapper for preprocessor, C and C++ compiler and setup

# symlinks for everything else. Skip gdb symlink when we are building our

# own gdb to prevent two gdb's in output/host/usr/bin.
@@ -647,9 +656,8 @@ define TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER 
			;; \

		esac; \

	done ;

	# We use --hash-style=both to increase the compatibility of

	# the generated binary with older platforms

	$(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_EXTERNAL_WRAPPER_ARGS) -s -Wl,--hash-style=both \

	$(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_EXTERNAL_WRAPPER_ARGS) \

		-s -Wl,--hash-style=$(TOOLCHAIN_EXTERNAL_WRAPPER_HASH_STYLE) \

		toolchain/toolchain-external/ext-toolchain-wrapper.c \

		-o $(HOST_DIR)/usr/bin/ext-toolchain-wrapper

endef