From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vlad Zakharov Date: Fri, 12 Aug 2016 12:45:31 +0000 Subject: [Buildroot] [PATCH] gcc: rename option for ARC gcc In-Reply-To: <1470921938-11550-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1470921938-11550-1-git-send-email-thomas.petazzoni@free-electrons.com> Message-ID: <1471005931.26536.12.camel@synopsys.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net All seems to be ok. Thank you for this contribution.? -- Best regards, Vlad Zakharov On Thu, 2016-08-11 at 15:25 +0200, Thomas Petazzoni wrote: > The ARC gcc version is now based on gcc 6.x and no longer gcc 4.8.x, > which makes the option BR2_GCC_VERSION_4_8_ARC a bit irrelevant, as is > the prompt of this option. > > This commit therefore renames this option to BR2_GCC_VERSION_ARC, and > adjust its prompt as well. > > Signed-off-by: Thomas Petazzoni > --- > ?Config.in.legacy???????????????????????|??7 +++++++ > ?package/gcc/Config.in.host?????????????| 10 +++++----- > ?package/gcc/gcc-initial/gcc-initial.mk |??2 +- > ?3 files changed, 13 insertions(+), 6 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index 746b80a..892a836 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -145,6 +145,13 @@ endif > ?############################################################################### > ?comment "Legacy options removed in 2016.08" > ? > +config BR2_GCC_VERSION_4_8_ARC > + bool "gcc arc option renamed" > + select BR2_LEGACY > + help > + ??The option is select the gcc version for the ARC > + ??architecture has been renamed to BR2_GCC_VERSION_ARC. > + > ?config BR2_PACKAGE_SYSTEMD_COMPAT > ? bool "systemd compatibility libraries have been removed" > ? select BR2_LEGACY > diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host > index 8b2b00a..38902fe 100644 > --- a/package/gcc/Config.in.host > +++ b/package/gcc/Config.in.host > @@ -8,7 +8,7 @@ config BR2_GCC_SUPPORTS_GRAPHITE > ? > ?choice > ? prompt "GCC compiler Version" > - default BR2_GCC_VERSION_4_8_ARC if BR2_arc > + default BR2_GCC_VERSION_ARC if BR2_arc > ? default BR2_GCC_VERSION_4_9_X > ? help > ? ??Select the version of gcc you wish to use. > @@ -50,12 +50,12 @@ choice > ? select BR2_GCC_SUPPORTS_GRAPHITE > ? select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > ? > - config BR2_GCC_VERSION_4_8_ARC > - bool "gcc 4.8-arc" > + config BR2_GCC_VERSION_ARC > + bool "gcc arc (6.x)" > ? # Only supported architecture > ? depends on BR2_arc > ? select BR2_GCC_NEEDS_MPC > - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 > ? > ? > ? config BR2_GCC_VERSION_4_9_X > @@ -107,7 +107,7 @@ config BR2_GCC_VERSION > ? default "4.9.4"?????if BR2_GCC_VERSION_4_9_X > ? default "5.4.0"?????if BR2_GCC_VERSION_5_X > ? default "6.1.0" if BR2_GCC_VERSION_6_X > - default "arc-2016.09-eng008" if BR2_GCC_VERSION_4_8_ARC > + default "arc-2016.09-eng008" if BR2_GCC_VERSION_ARC > ? > ?config BR2_EXTRA_GCC_CONFIG_OPTIONS > ? string "Additional gcc options" > diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk > index 1e58d8b..aa88a68 100644 > --- a/package/gcc/gcc-initial/gcc-initial.mk > +++ b/package/gcc/gcc-initial/gcc-initial.mk > @@ -29,7 +29,7 @@ HOST_GCC_INITIAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK > ?# available (--with-newlib is passed, and therefore inhibit_libc is > ?# defined), it tries to use the C library for the libgmon > ?# library. Since it's not needed in gcc-initial, we disabled it here. > -ifeq ($(BR2_GCC_VERSION_4_8_ARC),y) > +ifeq ($(BR2_GCC_VERSION_ARC),y) > ?define HOST_GCC_INITIAL_DISABLE_LIBGMON > ? $(SED) 's/crtbeginS.o libgmon.a crtg.o/crtbeginS.o crtg.o/' \ > ? $(@D)/libgcc/config.host