arch/misoc: Unify the toolchain definition of GNU for linux and windows

Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-04-19 14:47:44 +08:00 committed by Xiang Xiao
parent e066d5d1e0
commit 0cf8088406
3 changed files with 7 additions and 33 deletions

View File

@ -7,25 +7,15 @@ if ARCH_CHIP_LM32
choice choice
prompt "Toolchain Selection" prompt "Toolchain Selection"
default LM32_TOOLCHAIN_GNUW if TOOLCHAIN_WINDOWS default LM32_TOOLCHAIN_GNU
default LM32_TOOLCHAIN_GNUL if !TOOLCHAIN_WINDOWS
config LM32_TOOLCHAIN_BUILDROOT config LM32_TOOLCHAIN_BUILDROOT
bool "Buildroot (Cygwin or Linux)" bool "Buildroot (Cygwin or Linux)"
depends on !WINDOWS_NATIVE depends on !WINDOWS_NATIVE
select ARCH_TOOLCHAIN_GNU select ARCH_TOOLCHAIN_GNU
config LM32_TOOLCHAIN_GNUL config LM32_TOOLCHAIN_GNU
bool "Generic GNU toolchain under Linux (or other POSIX environment)" bool "Generic GNU toolchain"
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for lm32-elf-.
config LM32_TOOLCHAIN_GNUW
bool "Generic GNU toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU select ARCH_TOOLCHAIN_GNU
---help--- ---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer) This option should work for any modern GNU toolchain (GCC 4.5 or newer)

View File

@ -32,13 +32,7 @@ ifeq ($(filter y, \
endif endif
ifeq ($(filter y, \ ifeq ($(filter y, \
$(CONFIG_LM32_TOOLCHAIN_GNUL) \ $(CONFIG_LM32_TOOLCHAIN_GNU) \
),y)
CONFIG_LM32_TOOLCHAIN ?= GNU
endif
ifeq ($(filter y, \
$(CONFIG_LM32_TOOLCHAIN_GNUW) \
),y) ),y)
CONFIG_LM32_TOOLCHAIN ?= GNU CONFIG_LM32_TOOLCHAIN ?= GNU
endif endif

View File

@ -7,25 +7,15 @@ if ARCH_CHIP_MINERVA
choice choice
prompt "Toolchain Selection" prompt "Toolchain Selection"
default MINERVA_TOOLCHAIN_GNUW if TOOLCHAIN_WINDOWS default MINERVA_TOOLCHAIN_GNU
default MINERVA_TOOLCHAIN_GNUL if !TOOLCHAIN_WINDOWS
config MINERVA_TOOLCHAIN_BUILDROOT config MINERVA_TOOLCHAIN_BUILDROOT
bool "Buildroot (Cygwin or Linux)" bool "Buildroot (Cygwin or Linux)"
depends on !WINDOWS_NATIVE depends on !WINDOWS_NATIVE
select ARCH_TOOLCHAIN_GNU select ARCH_TOOLCHAIN_GNU
config MINERVA_TOOLCHAIN_GNUL config MINERVA_TOOLCHAIN_GNU
bool "Generic GNU toolchain under Linux (or other POSIX environment)" bool "Generic GNU toolchain"
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for risc64-elf-.
config MINERVA_TOOLCHAIN_GNUW
bool "Generic GNU toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU select ARCH_TOOLCHAIN_GNU
---help--- ---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer) This option should work for any modern GNU toolchain (GCC 4.5 or newer)