From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Fri, 7 Mar 2014 19:01:03 +0100 Subject: [Buildroot] [PATCH 1/1] [V5] toolchain: control vendor part in GNU_TARGET_NAME In-Reply-To: <884EA965490E3C4D8E66AEF41E980250096818@ezex10.ezchip.com> References: <1394155829-13670-1-git-send-email-noamc@ezchip.com> <884EA965490E3C4D8E66AEF41E980250096818@ezex10.ezchip.com> Message-ID: <20140307180102.GF3384@free.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Noam, All, On 2014-03-07 01:32 +0000, Noam Camus spake thusly: > This option allows to customize the "vendor" part of the > toolchain tuple, where the toolchain tuple has the form > ---. Use this option in situations > where gcc might make different decisions based on the vendor > part of the tuple. > > Signed-off-by: Noam Camus > --- > package/Makefile.in | 17 ++++++++++++++++- > toolchain/toolchain-buildroot/Config.in | 16 ++++++++++++++++ > 2 files changed, 32 insertions(+), 1 deletions(-) > > diff --git a/package/Makefile.in b/package/Makefile.in > index 454f614..bd9f18c 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -20,8 +20,23 @@ endif > MAKE1:=$(HOSTMAKE) -j1 > MAKE:=$(HOSTMAKE) $(if $(PARALLEL_JOBS),-j$(PARALLEL_JOBS)) > > +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) > +TARGET_VENDOR = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_VENDOR)) > +else > +TARGET_VENDOR = buildroot > +endif > + > +# Sanity checks > +ifeq ($(TARGET_VENDOR),) > +$(error BR2_TOOLCHAIN_BUILDROOT_VENDOR is not allowed to be empty) > +endif > +ifeq ($(TARGET_VENDOR),unknown) > +$(error BR2_TOOLCHAIN_BUILDROOT_VENDOR cannot be 'unknown'. \ > + It might be confused with the native toolchain) > +endif > + > # Compute GNU_TARGET_NAME > -GNU_TARGET_NAME=$(ARCH)-buildroot-$(TARGET_OS)-$(LIBC)$(ABI) > +GNU_TARGET_NAME=$(ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(LIBC)$(ABI) > > # Blackfin FLAT needs uclinux > ifeq ($(BR2_bfin)$(BR2_BINFMT_FLAT),yy) > diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in > index 07db50b..3487327 100644 > --- a/toolchain/toolchain-buildroot/Config.in > +++ b/toolchain/toolchain-buildroot/Config.in > @@ -70,6 +70,22 @@ config BR2_TOOLCHAIN_BUILDROOT_LIBC > default "glibc" if BR2_TOOLCHAIN_BUILDROOT_EGLIBC > default "glibc" if BR2_TOOLCHAIN_BUILDROOT_GLIBC Your mailer (or editor?) is mangling the patch: the above are leading tabs in the current source tree, so your patch won't apply, since it has leading spaces instead. > +config BR2_TOOLCHAIN_BUILDROOT_VENDOR > + string "custom toolchain vendor name" > + default "buildroot" > + help This should be a leading tab in front of 'string', 'default' and 'help' > + This option allows to customize the "vendor" part of the > + toolchain tuple, where the toolchain tuple has the form > + ---. The default value, "buildroot", > + is fine for most cases, except in very specific situations > + where gcc might make different decisions based on the vendor > + part of the tuple. The value "unknown" is not allowed, as the > + cross-compiling toolchain might then be confused with the > + native toolchain when the target and host architecture are > + identical. > + > + If you're not sure, just leave the default "buildroot" value. This should be a leading tab and two spaces in front of the help text. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'