Commit a22dc0f2 authored by Arnout Vandecappelle (Essensium/Mind)'s avatar Arnout Vandecappelle (Essensium/Mind) Committed by Peter Korsgaard
Browse files

ext-toolchain: Automatically set -m64 if the architecture is x86_64 



Without the -m64, choosing the x86_64 architecture with a Sourcery external
toolchain will result in a 32-bit rootfs.

Also simplified the help text to reflect this change.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 39bd61c6

toolchain/toolchain-external/Config.in

+18 −16
Original line number Diff line number Diff line
@@ -371,14 +371,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109 
	  binutils 2.21.53, glibc 2.13, gdb 7.2.50 and kernel headers

	  3.0.1. It has support for the following variants:

	    - Intel Pentium 4, glibc, 32 bits

              Default, nothing special to do.

	      Default for x86, nothing special to do.

	    - Intel Atom, glibc, 32 bits

	      Select an Atom core

	    - Intel Xeon, glibc, 64 bits

              Set BR2_TARGET_OPTIMIZATION to -m64

	      Default for x86_64, nothing special to do.

	    - Intel Core 2, glibc, 64 bits

	      Select a Core 2 core

              Set BR2_TARGET_OPTIMIZATION to -m64

	  Other architecture variants (beyond Pentium-4/Xeon) are

	  supported as well, but glibc is not optimised for it.



config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009

	bool "Sourcery CodeBench x86/x86_64 2010.09"
@@ -391,14 +392,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009 
	  binutils 2.20, glibc 2.11, gdb 7.2.50 and kernel headers

	  2.6.35.2. It has support for the following variants:

	    - Intel Pentium 4, glibc, 32 bits

              Default, nothing special to do.

	      Default for x86, nothing special to do.

	    - Intel Atom, glibc, 32 bits

	      Select an Atom core

	    - Intel Xeon, glibc, 64 bits

              Set BR2_TARGET_OPTIMIZATION to -m64

	      Default for x86_64, nothing special to do.

	    - Intel Core 2, glibc, 64 bits

	      Select a Core 2 core

              Set BR2_TARGET_OPTIMIZATION to -m64

	  Other architecture variants (beyond Pentium-4/Xeon) are

	  supported as well, but glibc is not optimised for it.



config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1

	bool "Blackfin.uclinux.org 2011R1-RC4"

toolchain/toolchain-external/ext-tool.mk

+4 −0
Original line number Diff line number Diff line
@@ -133,6 +133,10 @@ CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI)) 


# march/mtune/floating point mode needs to be passed to the external toolchain

# to select the right multilib variant

ifeq ($(BR2_x86_64),y)

TOOLCHAIN_EXTERNAL_CFLAGS += -m64

TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_64

endif

ifneq ($(CC_TARGET_TUNE_),)

TOOLCHAIN_EXTERNAL_CFLAGS += -mtune=$(CC_TARGET_TUNE_)

TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_TUNE='"$(CC_TARGET_TUNE_)"'

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

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ static char *predef_args[] = { 
#ifdef BR_VFPFLOAT

	"-mfpu=vfp",

#endif /* BR_VFPFLOAT */

#ifdef BR_64

	"-m64",

#endif

#ifdef BR_ADDITIONAL_CFLAGS

	BR_ADDITIONAL_CFLAGS

#endif