You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/04/19 15:17:41 UTC
[incubator-nuttx] 06/07: arch/misoc: Unify the toolchain definition of GNU for linux and windows
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 0cf8088406cc9e7cfa57ec94413d848eab5b36fa
Author: chao.an <an...@xiaomi.com>
AuthorDate: Tue Apr 19 14:47:44 2022 +0800
arch/misoc: Unify the toolchain definition of GNU for linux and windows
Signed-off-by: chao.an <an...@xiaomi.com>
---
arch/misoc/src/lm32/Kconfig | 16 +++-------------
arch/misoc/src/lm32/Toolchain.defs | 8 +-------
arch/misoc/src/minerva/Kconfig | 16 +++-------------
3 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/arch/misoc/src/lm32/Kconfig b/arch/misoc/src/lm32/Kconfig
index 83ce834dce..b4c3e858d8 100644
--- a/arch/misoc/src/lm32/Kconfig
+++ b/arch/misoc/src/lm32/Kconfig
@@ -7,25 +7,15 @@ if ARCH_CHIP_LM32
choice
prompt "Toolchain Selection"
- default LM32_TOOLCHAIN_GNUW if TOOLCHAIN_WINDOWS
- default LM32_TOOLCHAIN_GNUL if !TOOLCHAIN_WINDOWS
+ default LM32_TOOLCHAIN_GNU
config LM32_TOOLCHAIN_BUILDROOT
bool "Buildroot (Cygwin or Linux)"
depends on !WINDOWS_NATIVE
select ARCH_TOOLCHAIN_GNU
-config LM32_TOOLCHAIN_GNUL
- bool "Generic GNU toolchain under Linux (or other POSIX environment)"
- 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
+config LM32_TOOLCHAIN_GNU
+ bool "Generic GNU toolchain"
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
diff --git a/arch/misoc/src/lm32/Toolchain.defs b/arch/misoc/src/lm32/Toolchain.defs
index 0ba33d9da0..9b1016e170 100644
--- a/arch/misoc/src/lm32/Toolchain.defs
+++ b/arch/misoc/src/lm32/Toolchain.defs
@@ -32,13 +32,7 @@ ifeq ($(filter y, \
endif
ifeq ($(filter y, \
- $(CONFIG_LM32_TOOLCHAIN_GNUL) \
- ),y)
- CONFIG_LM32_TOOLCHAIN ?= GNU
-endif
-
-ifeq ($(filter y, \
- $(CONFIG_LM32_TOOLCHAIN_GNUW) \
+ $(CONFIG_LM32_TOOLCHAIN_GNU) \
),y)
CONFIG_LM32_TOOLCHAIN ?= GNU
endif
diff --git a/arch/misoc/src/minerva/Kconfig b/arch/misoc/src/minerva/Kconfig
index 3be1b36d58..df536bc7a3 100644
--- a/arch/misoc/src/minerva/Kconfig
+++ b/arch/misoc/src/minerva/Kconfig
@@ -7,25 +7,15 @@ if ARCH_CHIP_MINERVA
choice
prompt "Toolchain Selection"
- default MINERVA_TOOLCHAIN_GNUW if TOOLCHAIN_WINDOWS
- default MINERVA_TOOLCHAIN_GNUL if !TOOLCHAIN_WINDOWS
+ default MINERVA_TOOLCHAIN_GNU
config MINERVA_TOOLCHAIN_BUILDROOT
bool "Buildroot (Cygwin or Linux)"
depends on !WINDOWS_NATIVE
select ARCH_TOOLCHAIN_GNU
-config MINERVA_TOOLCHAIN_GNUL
- bool "Generic GNU toolchain under Linux (or other POSIX environment)"
- 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
+config MINERVA_TOOLCHAIN_GNU
+ bool "Generic GNU toolchain"
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)