jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

gcc: rename option for ARC gcc

Browse Source 
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 <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2016-08-11 15:25:38 +02:00
parent c464f96004
commit 50332a530b
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Config.in.legacy
View File

@ -145,6 +145,14 @@ endif
############################################################################### ###############################################################################
comment "Legacy options removed in 2016.11" comment "Legacy options removed in 2016.11"
config BR2_GCC_VERSION_4_8_ARC
bool "gcc arc option renamed"
select BR2_LEGACY
select BR2_GCC_VERSION_ARC
help
The option that selects the gcc version for the ARC
architecture has been renamed to BR2_GCC_VERSION_ARC.
config BR2_KERNEL_HEADERS_4_0 config BR2_KERNEL_HEADERS_4_0
bool "kernel headers version 4.0.x are no longer supported" bool "kernel headers version 4.0.x are no longer supported"
select BR2_KERNEL_HEADERS_3_18 select BR2_KERNEL_HEADERS_3_18

10
package/gcc/Config.in.host
View File

@ -8,7 +8,7 @@ config BR2_GCC_SUPPORTS_GRAPHITE
choice choice
prompt "GCC compiler Version" 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 default BR2_GCC_VERSION_4_9_X
help help
Select the version of gcc you wish to use. Select the version of gcc you wish to use.
@ -56,12 +56,12 @@ choice
select BR2_GCC_SUPPORTS_GRAPHITE select BR2_GCC_SUPPORTS_GRAPHITE
select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
config BR2_GCC_VERSION_4_8_ARC config BR2_GCC_VERSION_ARC
bool "gcc 4.8-arc" bool "gcc arc (6.x)"
# Only supported architecture # Only supported architecture
depends on BR2_arc depends on BR2_arc
select BR2_GCC_NEEDS_MPC 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 config BR2_GCC_VERSION_4_9_X
@ -121,7 +121,7 @@ config BR2_GCC_VERSION
default "4.9.4" if BR2_GCC_VERSION_4_9_X default "4.9.4" if BR2_GCC_VERSION_4_9_X
default "5.4.0" if BR2_GCC_VERSION_5_X default "5.4.0" if BR2_GCC_VERSION_5_X
default "6.2.0" if BR2_GCC_VERSION_6_X default "6.2.0" if BR2_GCC_VERSION_6_X
default "arc-2016.09-eng013" if BR2_GCC_VERSION_4_8_ARC default "arc-2016.09-eng013" if BR2_GCC_VERSION_ARC
config BR2_EXTRA_GCC_CONFIG_OPTIONS config BR2_EXTRA_GCC_CONFIG_OPTIONS
string "Additional gcc options" string "Additional gcc options"

2
package/gcc/gcc-initial/gcc-initial.mk
View File

@ -29,7 +29,7 @@ HOST_GCC_INITIAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK
# available (--with-newlib is passed, and therefore inhibit_libc is # available (--with-newlib is passed, and therefore inhibit_libc is
# defined), it tries to use the C library for the libgmon # defined), it tries to use the C library for the libgmon
# library. Since it's not needed in gcc-initial, we disabled it here. # 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 define HOST_GCC_INITIAL_DISABLE_LIBGMON
$(SED) 's/crtbeginS.o libgmon.a crtg.o/crtbeginS.o crtg.o/' \ $(SED) 's/crtbeginS.o libgmon.a crtg.o/crtbeginS.o crtg.o/' \
$(@D)/libgcc/config.host $(@D)/libgcc/config.host