summaryrefslogtreecommitdiff
path: root/core/toolchain
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-11-01 23:47:34 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-11-02 01:39:19 +0100
commitbe095a1ee029655802921172f0a1a8f87d053f72 (patch)
treefa10af5437b366faac27e2b2e158b5487fb8d2ab /core/toolchain
parent39f7a079eb2cd2432cb12671066adb72ef9088dd (diff)
downloadembtoolkit-be095a1ee029655802921172f0a1a8f87d053f72.tar.gz
embtoolkit-be095a1ee029655802921172f0a1a8f87d053f72.tar.bz2
embtoolkit-be095a1ee029655802921172f0a1a8f87d053f72.tar.xz
Toolchain: gcc: add v4.9.2
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'core/toolchain')
-rw-r--r--core/toolchain/gcc/gcc.kconfig15
-rw-r--r--core/toolchain/gcc/gcc.mk1
-rw-r--r--core/toolchain/toolchain.kconfig2
3 files changed, 17 insertions, 1 deletions
diff --git a/core/toolchain/gcc/gcc.kconfig b/core/toolchain/gcc/gcc.kconfig
index d3e9622..d7fabef 100644
--- a/core/toolchain/gcc/gcc.kconfig
+++ b/core/toolchain/gcc/gcc.kconfig
@@ -33,6 +33,8 @@ choice
help
Here you can choose which GCC series you want to use.
+ config EMBTK_GCC_VERSION_4_9_X
+ bool "gcc-4.9.x"
config EMBTK_GCC_VERSION_4_8_X
bool "gcc-4.8.x"
config EMBTK_GCC_VERSION_4_7_X
@@ -45,6 +47,18 @@ choice
See http://gcc.gnu.org/git/?p=gcc.git
endchoice
+# GCC-4.9.x
+choice
+ prompt "Version of gcc-4.9.x you wish"
+ depends on EMBTK_GCC_VERSION_4_9_X
+ help
+ gcc-4.9.x version used.
+
+ config EMBTK_GCC_VERSION_4_9_2
+ bool "gcc-4.9.2"
+ select EMBTK_GCC_NEED_PATCH
+endchoice
+
# GCC-4.8.x
choice
prompt "Version of gcc-4.8.x you wish"
@@ -93,6 +107,7 @@ config EMBTK_GCC_REFSPEC
#
config EMBTK_GCC_VERSION_STRING
string
+ default "4.9.2" if EMBTK_GCC_VERSION_4_9_2
default "4.8.3" if EMBTK_GCC_VERSION_4_8_3
default "4.7.4" if EMBTK_GCC_VERSION_4_7_4
default "git" if EMBTK_GCC_VERSION_GIT
diff --git a/core/toolchain/gcc/gcc.mk b/core/toolchain/gcc/gcc.mk
index c45fb70..3fca324 100644
--- a/core/toolchain/gcc/gcc.mk
+++ b/core/toolchain/gcc/gcc.mk
@@ -105,6 +105,7 @@ pembtk_gcc3_extraopts-$(CONFIG_KEMBTK_UCLIBC_LINUXTHREADS_OLD) += --disable-tls
ifeq ($(CONFIG_EMBTK_CLIB_MUSL)$(CONFIG_EMBTK_ARCH_MIPS),yy)
pembtk_gcc3_extraopts-y += --disable-tls
endif
+pembtk_gcc3_extraopts-$(CONFIG_EMBTK_CLIB_MUSL) += --disable-libsanitizer
GCC3_CONFIGURE_EXTRA_OPTIONS += $(pembtk_gcc3_extraopts-y)
diff --git a/core/toolchain/toolchain.kconfig b/core/toolchain/toolchain.kconfig
index 94f4e21..0d3f4ad 100644
--- a/core/toolchain/toolchain.kconfig
+++ b/core/toolchain/toolchain.kconfig
@@ -123,7 +123,7 @@ choice
config EMBTK_CLIB_MUSL
bool "musl"
- depends on (EMBTK_TARGET_ARCH_32BITS && EMBTK_GCC_VERSION_4_8_X)
+ depends on EMBTK_TARGET_ARCH_32BITS && (EMBTK_GCC_VERSION_4_8_X || EMBTK_GCC_VERSION_4_9_X)
help
musl is a new general-purpose implementation of the C library.
It is lightweight, fast, simple, free, and aims to be correct