Skip to content

Commit

Permalink
Sync with 0c64759
Browse files Browse the repository at this point in the history
  • Loading branch information
diorcety committed Sep 10, 2014
1 parent 60f31b7 commit c0e602d
Show file tree
Hide file tree
Showing 153 changed files with 6,201 additions and 1,495 deletions.
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated files
configure
autom4te.cache
config.log
config.status
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/
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
hg
1.20.0
1 change: 1 addition & 0 deletions config/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
configure.in
4 changes: 3 additions & 1 deletion config/arch/powerpc.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
35 changes: 24 additions & 11 deletions config/binutils/binutils.in.2
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"
Expand All @@ -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"
Expand Down
49 changes: 48 additions & 1 deletion config/cc/gcc.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,27 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW

config CC_V_4_9_1
bool
prompt "4.9.1"
select CC_GCC_4_9

config CC_V_4_9_0
bool
prompt "4.9.0"
select CC_GCC_4_9

config CC_V_linaro_4_8
bool
prompt "linaro-4.8-2014.01"
depends on CC_GCC_SHOW_LINARO
select CC_GCC_4_8

config CC_V_4_8_3
bool
prompt "4.8.3"
select CC_GCC_4_8

config CC_V_4_8_2
bool
prompt "4.8.2"
Expand All @@ -63,6 +78,11 @@ config CC_V_linaro_4_7
depends on CC_GCC_SHOW_LINARO
select CC_GCC_4_7

config CC_V_4_7_4
bool
prompt "4.7.4"
select CC_GCC_4_7

config CC_V_4_7_3
bool
prompt "4.7.3"
Expand Down Expand Up @@ -348,15 +368,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
Expand All @@ -365,6 +404,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_HAS_GRAPHITE
bool
Expand Down Expand Up @@ -445,15 +485,22 @@ config CC_GCC_USE_LIBELF
config CC_GCC_HAS_LIBQUADMATH
bool

config CC_GCC_HAS_LIBSANITIZER
bool

config CC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
default "4.9.1" if CC_V_4_9_1
default "4.9.0" if CC_V_4_9_0
default "linaro-4.8-2014.01" if CC_V_linaro_4_8
default "4.8.3" if CC_V_4_8_3
default "4.8.2" if CC_V_4_8_2
default "4.8.1" if CC_V_4_8_1
default "4.8.0" if CC_V_4_8_0
default "linaro-4.7-2014.01" if CC_V_linaro_4_7
default "4.7.4" if CC_V_4_7_4
default "4.7.3" if CC_V_4_7_3
default "4.7.2" if CC_V_4_7_2
default "4.7.1" if CC_V_4_7_1
Expand Down
16 changes: 15 additions & 1 deletion config/cc/gcc.in.2
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ config CC_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.

Expand All @@ -29,7 +30,6 @@ config CC_EXTRA_CONFIG_ARRAY
string
prompt "gcc extra config"
default ""
depends on ! BARE_METAL
help
Extra flags to pass onto ./configure when configuring gcc.

Expand Down Expand Up @@ -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."
Expand Down
32 changes: 1 addition & 31 deletions config/companion_libs/cloog.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
2 changes: 1 addition & 1 deletion config/config.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
22 changes: 11 additions & 11 deletions config/config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
17 changes: 16 additions & 1 deletion config/debug/gdb.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,19 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW

config GDB_V_7_8
bool
prompt "7.8"
select GDB_7_2_or_later

config GDB_V_7_7_1
bool
prompt "7.7.1"
select GDB_7_2_or_later

config GDB_V_7_7
bool
prompt "7.7"
select GDB_7_0_or_later
select GDB_7_2_or_later

config GDB_V_7_6_1
Expand Down Expand Up @@ -138,18 +147,24 @@ config GDB_7_2_or_later
config GDB_7_0_or_later
bool
select GDB_HAS_PKGVERSION_BUGURL
select GDB_HAS_PYTHON
select GDB_INSTALL_GDBINIT

config GDB_HAS_PKGVERSION_BUGURL
bool

config GDB_HAS_PYTHON
bool

config GDB_INSTALL_GDBINIT
bool

config GDB_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
default "7.8" if GDB_V_7_8
default "7.7.1" if GDB_V_7_7_1
default "7.7" if GDB_V_7_7
default "7.6.1" if GDB_V_7_6_1
default "linaro-7.6-2013.05" if GDB_V_linaro_7_6_2013_05
Expand Down
1 change: 1 addition & 0 deletions config/debug/gdb.in.cross
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ config GDB_CROSS_SIM
config GDB_CROSS_PYTHON
bool
prompt "Enable python scripting"
depends on GDB_HAS_PYTHON
depends on ! GDB_CROSS_STATIC
default y
help
Expand Down
Loading

0 comments on commit c0e602d

Please sign in to comment.