Merge branch 'official'

Conflicts:
	.gitignore
	config/binutils/binutils.in
	config/cc/gcc.in
	config/debug/gdb.in
	config/kernel/linux.in
	config/libc.in
	config/libc/eglibc.in
	samples/alphaev56-unknown-linux-gnu/crosstool.config
	samples/alphaev67-unknown-linux-gnu/crosstool.config
	samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
	samples/arm-cortex_a8-linux-gnueabi/crosstool.config
	samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
	samples/arm-davinci-linux-gnueabi/crosstool.config
	samples/arm-unknown-eabi/crosstool.config
	samples/arm-unknown-linux-gnueabi/crosstool.config
	samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
	samples/armeb-unknown-eabi/crosstool.config
	samples/armeb-unknown-linux-gnueabi/crosstool.config
	samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
	samples/bfin-unknown-linux-uclibc/crosstool.config
	samples/i586-geode-linux-uclibc/crosstool.config
	samples/i586-mingw32msvc,i686-none-linux-gnu/crosstool.config
	samples/i686-nptl-linux-gnu/crosstool.config
	samples/i686-unknown-mingw32/crosstool.config
	samples/m68k-unknown-elf/crosstool.config
	samples/mips-ar2315-linux-gnu/crosstool.config
	samples/mips-malta-linux-gnu/crosstool.config
	samples/mips-unknown-elf/crosstool.config
	samples/mips-unknown-linux-uclibc/crosstool.config
	samples/mips64el-n32-linux-uclibc/crosstool.config
	samples/mips64el-n64-linux-uclibc/crosstool.config
	samples/mipsel-sde-elf/crosstool.config
	samples/mipsel-unknown-linux-gnu/crosstool.config
	samples/powerpc-405-linux-gnu/crosstool.config
	samples/powerpc-860-linux-gnu/crosstool.config
	samples/powerpc-e300c3-linux-gnu/crosstool.config
	samples/powerpc-unknown-linux-gnu/crosstool.config
	samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
	samples/powerpc64-unknown-linux-gnu/crosstool.config
	samples/s390-ibm-linux-gnu/crosstool.config
	samples/s390x-ibm-linux-gnu/crosstool.config
	samples/sh4-unknown-linux-gnu/crosstool.config
	samples/x86_64-unknown-linux-gnu/crosstool.config
	samples/x86_64-unknown-linux-uclibc/crosstool.config
	samples/x86_64-unknown-mingw32/crosstool.config
	scripts/build/cc/100-gcc.sh
	scripts/config.sub
	scripts/functions

.gitignore

@@ -1,10 +1,23 @@
-.build
-.config*
-autom4te.cache/*
-build.log
+# Generated files
+configure
+autom4te.cache
 config.log
-config.gen
 config.status
-ct-ng
-kconfig/*
 Makefile
+*ct-ng*
+!ct-ng.comp
+!ct-ng.in
+paths.*
+config.gen/
+.config
+.config.2
+
+# Temporaries
+.*.swp
+build.log
+.config.old
+
+# This is the place where toolchains are built
+.build/
+# .. and the legacy location
+targets/

.version

@@ -1 +1 @@
-hg
+1.20.0

config/.gitignore

@@ -0,0 +1 @@
+configure.in

config/arch/powerpc.in

@@ -1,8 +1,10 @@
 # powerpc specific configuration file
 
 ## select ARCH_SUPPORTS_32
-## select ARCH_SUPPORTS_64 if EXPERIMENTAL
+## select ARCH_SUPPORTS_64
 ## select ARCH_DEFAULT_32
+## select ARCH_SUPPORTS_BOTH_ENDIAN
+## select ARCH_DEFAULT_BE
 ## select ARCH_USE_MMU
 ## select ARCH_SUPPORTS_WITH_ABI
 ## select ARCH_SUPPORTS_WITH_CPU

config/binutils/binutils.in

@@ -11,12 +11,6 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
-config BINUTILS_V_2_24
-    bool
-    prompt "2.24 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    select BINUTILS_2_24_or_later
-
 config BINUTILS_V_2_24
     bool
     prompt "2.24 (EXPERIMENTAL)"
@@ -100,12 +94,6 @@ config BINUTILS_VERSION
     default "2.18a" if BINUTILS_V_2_18a
     default "custom" if BINUTILS_CUSTOM
 
-config BINUTILS_2_24_or_later
-    bool
-    select BINUTILS_2_23_or_later
-    select BINUTILS_HAS_GOLD
-    select BINUTILS_HAS_PLUGINS
-
 config BINUTILS_2_24_or_later
     bool
     select BINUTILS_2_23_or_later

config/binutils/binutils.in.2

@@ -7,12 +7,10 @@ comment "elf2flt"
 choice
     bool
     prompt "elf2flt version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
 
-config ELF2FLT_CVSHEAD
+config ELF2FLT_GIT
     bool
-    prompt "CVS Head"
+    prompt "git"
     help
       Grab the latest version of elf2flt from the CVS repository
 
@@ -23,8 +21,30 @@ config ELF2FLT_CUSTOM
 
 endchoice
 
+config ELF2FLT_VERSION
+    string
+
+if ELF2FLT_GIT
+
+config ELF2FLT_GIT_CSET
+    string
+    prompt "git cset"
+    default "21c6a41885ad544763ccd19883c1353f3b0b7a47"
+    help
+      Enter the git changeset to use.
+
+      The default currently points to the HEAD of the git tree.
+
+config ELF2FLT_VERSION
+    default ELF2FLT_GIT_CSET
+
+endif # ELF2FLT_GIT
+
 if ELF2FLT_CUSTOM
 
+config ELF2FLT_VERSION
+    default "custom"
+
 config ELF2FLT_CUSTOM_LOCATION
     string
     prompt "Full path to custom elf2flt source"
@@ -35,13 +55,6 @@ config ELF2FLT_CUSTOM_LOCATION
 
 endif # ELF2FLT_CUSTOM
 
-config ELF2FLT_VERSION
-    string
-    default "cvs" if ELF2FLT_CVSHEAD
-    default "custom" if ELF2FLT_CUSTOM
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-
 config ELF2FLT_EXTRA_CONFIG_ARRAY
     string
     prompt "elf2flt extra config"

config/cc/gcc.in

@@ -53,12 +53,27 @@ endif
 
 if ! DARWIN
 
+config CC_GCC_V_4_9_1
+    bool
+    prompt "4.9.1"
+    select CC_GCC_4_9
+
+config CC_GCC_V_4_9_0
+    bool
+    prompt "4.9.0"
+    select CC_GCC_4_9
+
 config CC_GCC_V_linaro_4_8
     bool
     prompt "linaro-4.8-2014.01"
     depends on CC_GCC_SHOW_LINARO
     select CC_GCC_4_8
 
+config CC_GCC_V_4_8_3
+    bool
+    prompt "4.8.3"
+    select CC_GCC_4_8
+
 config CC_GCC_V_4_8_2
     bool
     prompt "4.8.2"
@@ -80,6 +95,11 @@ config CC_GCC_V_linaro_4_7
     depends on CC_GCC_SHOW_LINARO
     select CC_GCC_4_7
 
+config CC_GCC_V_4_7_4
+    bool
+    prompt "4.7.4"
+    select CC_GCC_4_7
+
 config CC_GCC_V_4_7_3
     bool
     prompt "4.7.3"
@@ -367,15 +387,34 @@ config CC_GCC_4_8
     select CC_GCC_HAS_BUILD_ID
     select CC_GCC_HAS_LNK_HASH_STYLE
     select CC_GCC_HAS_LIBQUADMATH
+    select CC_GCC_HAS_LIBSANITIZER
     select CC_SUPPORT_GOLANG
 
 config CC_GCC_4_8_or_later
     bool
     select CC_GCC_4_7_or_later
 
-config CC_GCC_latest
+config CC_GCC_4_9
+    bool
+    select CC_GCC_4_9_or_later
+    select CC_GCC_USE_GMP_MPFR
+    select CC_GCC_USE_MPC
+    select CC_GCC_HAS_GRAPHITE
+    select CC_GCC_HAS_LTO
+    select CC_GCC_HAS_PKGVERSION_BUGURL
+    select CC_GCC_HAS_BUILD_ID
+    select CC_GCC_HAS_LNK_HASH_STYLE
+    select CC_GCC_HAS_LIBQUADMATH
+    select CC_GCC_HAS_LIBSANITIZER
+    select CC_SUPPORT_GOLANG
+
+config CC_GCC_4_9_or_later
     bool
     select CC_GCC_4_8_or_later
+
+config CC_GCC_latest
+    bool
+    select CC_GCC_4_9_or_later
     select CC_GCC_USE_GMP_MPFR
     select CC_GCC_USE_MPC
     select CC_GCC_HAS_GRAPHITE
@@ -384,6 +423,7 @@ config CC_GCC_latest
     select CC_GCC_HAS_BUILD_ID
     select CC_GCC_HAS_LNK_HASH_STYLE
     select CC_GCC_HAS_LIBQUADMATH
+    select CC_GCC_HAS_LIBSANITIZER
 
 config CC_GCC_APPLE
     bool
@@ -473,12 +513,18 @@ config CC_GCC_USE_LIBELF
 config CC_GCC_HAS_LIBQUADMATH
     bool
 
+config CC_GCC_HAS_LIBSANITIZER
+    bool
+
 config CC_GCC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
-    default "5666.3" if CC_GCC_V_apple_5666_3 
+    default "5666.3" if CC_GCC_V_apple_5666_3
+    default "4.9.1" if CC_GCC_V_4_9_1
+    default "4.9.0" if CC_GCC_V_4_9_0
     default "linaro-4.8-2014.01" if CC_GCC_V_linaro_4_8
+    default "4.8.3" if CC_GCC_V_4_8_3
     default "4.8.2" if CC_GCC_V_4_8_2
     default "4.8.1" if CC_GCC_V_4_8_1
     default "4.8.0" if CC_GCC_V_4_8_0

config/cc/gcc.in.2

@@ -15,6 +15,7 @@ config CC_GCC_CORE_EXTRA_CONFIG_ARRAY
     string
     prompt "Core gcc extra config"
     default ""
+    depends on CC_CORE_PASS_1_NEEDED || CC_CORE_PASS_2_NEEDED
     help
       Extra flags to pass onto ./configure when configuring the core gcc.
 
@@ -29,7 +30,6 @@ config CC_GCC_EXTRA_CONFIG_ARRAY
     string
     prompt "gcc extra config"
     default ""
-    depends on ! BARE_METAL
     help
       Extra flags to pass onto ./configure when configuring gcc.
 
@@ -143,6 +143,20 @@ config CC_GCC_LIBQUADMATH
 
       The default is 'N'. Say 'Y' if you need it, and report success/failure.
 
+config CC_GCC_LIBSANITIZER
+    bool
+    prompt "Compile libsanitizer"
+    depends on CC_GCC_HAS_LIBSANITIZER
+    depends on THREADS_NATIVE
+    depends on ! LIBC_uClibc # Currently lacks required headers (like netrom.h)
+    help
+      libsanitizer is a library which provides run-time sanitising of either
+      or both of:
+        - memory access patterns (out-of-bonds, use-after-free)
+        - racy data accesses (in multi-threaded programs)
+
+      The default is 'N'. Say 'Y' if you need it, and report success/failure.
+
 #-----------------------------------------------------------------------------
 
 comment "Misc. obscure options."

config/companion_libs/cloog.in

@@ -26,28 +26,7 @@ if PPL
 config CLOOG_V_0_15_11
     bool
     prompt "0.15.11"
-    select CLOOG_0_15_1x
-
-config CLOOG_V_0_15_10
-    bool
-    prompt "0.15.10"
-    select CLOOG_0_15_1x
-
-config CLOOG_V_0_15_9
-    bool
-    prompt "0.15.9"
-
-config CLOOG_V_0_15_8
-    bool
-    prompt "0.15.8"
-
-config CLOOG_V_0_15_7
-    bool
-    prompt "0.15.7"
-
-config CLOOG_V_0_15_6
-    bool
-    prompt "0.15.6"
+    select CLOOG_NEEDS_AUTORECONF
 
 endif # PPL
 
@@ -60,18 +39,9 @@ config CLOOG_VERSION
     default "0.18.1" if CLOOG_V_0_18_1
     default "0.18.0" if CLOOG_V_0_18_0
     default "0.15.11" if CLOOG_V_0_15_11
-    default "0.15.10" if CLOOG_V_0_15_10
-    default "0.15.9" if CLOOG_V_0_15_9
-    default "0.15.8" if CLOOG_V_0_15_8
-    default "0.15.7" if CLOOG_V_0_15_7
-    default "0.15.6" if CLOOG_V_0_15_6
 
 config CLOOG_0_18_or_later
     bool
 
-config CLOOG_0_15_1x
-    bool
-    select CLOOG_NEEDS_AUTORECONF
-
 config CLOOG_NEEDS_AUTORECONF
     bool

config/config.in

@@ -5,8 +5,8 @@ source "config/target.in"
 source "config/toolchain.in"
 source "config/kernel.in"
 source "config/binutils.in"
-source "config/cc.in"
 source "config/libc.in"
+source "config/cc.in"
 source "config/debug.in"
 source "config/companion_libs.in"
 source "config/companion_tools.in"

config/config.mk

@@ -15,17 +15,17 @@ STATIC_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(shell find $(CT_LIB_DIR)/co
 $(STATIC_CONFIG_FILES): config
 
 # Build a list of per-component-type source config files
-ARCH_CONFIG_FILES       = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/arch/*.in))
-ARCH_CONFIG_FILES_2     = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/arch/*.in.2))
-KERNEL_CONFIG_FILES     = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/kernel/*.in))
-KERNEL_CONFIG_FILES_2   = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/kernel/*.in.2))
-CC_CONFIG_FILES         = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/cc/*.in))
-CC_CONFIG_FILES_2       = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/cc/*.in.2))
-BINUTILS_CONFIG_FILES   = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/binutils/*.in))
-BINUTILS_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/binutils/*.in.2))
-LIBC_CONFIG_FILES       = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/libc/*.in))
-LIBC_CONFIG_FILES_2     = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/libc/*.in.2))
-DEBUG_CONFIG_FILES      = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/debug/*.in))
+ARCH_CONFIG_FILES       = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/arch/*.in)))
+ARCH_CONFIG_FILES_2     = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/arch/*.in.2)))
+KERNEL_CONFIG_FILES     = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/kernel/*.in)))
+KERNEL_CONFIG_FILES_2   = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/kernel/*.in.2)))
+CC_CONFIG_FILES         = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/cc/*.in)))
+CC_CONFIG_FILES_2       = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/cc/*.in.2)))
+BINUTILS_CONFIG_FILES   = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/binutils/*.in)))
+BINUTILS_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/binutils/*.in.2)))
+LIBC_CONFIG_FILES       = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/libc/*.in)))
+LIBC_CONFIG_FILES_2     = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/libc/*.in.2)))
+DEBUG_CONFIG_FILES      = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/debug/*.in)))
 
 # Build the list of generated config files
 GEN_CONFIG_FILES = config.gen/arch.in     \