From 41892bbf74db84ad812597bd7df90a43052fcbc5 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 30 Sep 2015 22:39:51 -0700 Subject: Stash nios2 config adjusted for consistence with the rest. Signed-off-by: Alexey Neyman diff --git a/samples/nios2-elf-mingw32/crosstool.config b/samples/nios2-elf-mingw32/crosstool.config index 2eabf0d..4f7c39b 100644 --- a/samples/nios2-elf-mingw32/crosstool.config +++ b/samples/nios2-elf-mingw32/crosstool.config @@ -1,539 +1,20 @@ -# -# Automatically generated make config: don't edit -# crosstool-NG Configuration -# Mon Jan 26 21:42:57 2015 -# -CT_CONFIGURE_has_make381=y -CT_CONFIGURE_has_xz=y -CT_CONFIGURE_has_cvs=y -CT_CONFIGURE_has_svn=y -CT_MODULES=y - -# -# Paths and misc options -# - -# -# crosstool-NG behavior -# -# CT_OBSOLETE is not set CT_EXPERIMENTAL=y -# CT_EXPERIMENTAL_PATCHES is not set -# CT_ALLOW_BUILD_AS_ROOT is not set -# CT_DEBUG_CT is not set - -# -# Paths -# -CT_LOCAL_TARBALLS_DIR="${NG_DOWNLOAD_PATH}/ct_src" +CT_LOCAL_TARBALLS_DIR="${HOME}/src" CT_SAVE_TARBALLS=y -CT_CUSTOM_LOCATION_ROOT_DIR="" -CT_WORK_DIR="${CT_TOP_DIR}/.build" -CT_PREFIX_DIR="${NG_IMAGE_PATH}/x-tools/${CT_TARGET}" -CT_INSTALL_DIR="${CT_PREFIX_DIR}" -CT_RM_RF_PREFIX_DIR=y # CT_REMOVE_DOCS is not set -# CT_BUILD_MANUALS is not set -CT_INSTALL_DIR_RO=y -CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES=y - -# -# Downloading -# -# CT_FORBID_DOWNLOAD is not set -# CT_FORCE_DOWNLOAD is not set -CT_CONNECT_TIMEOUT=10 -# CT_ONLY_DOWNLOAD is not set -# CT_USE_MIRROR is not set - -# -# Extracting -# -# CT_FORCE_EXTRACT is not set -CT_OVERIDE_CONFIG_GUESS_SUB=y -# CT_ONLY_EXTRACT is not set -CT_PATCH_BUNDLED=y -# CT_PATCH_LOCAL is not set -# CT_PATCH_BUNDLED_LOCAL is not set -# CT_PATCH_LOCAL_BUNDLED is not set -# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set -# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set -# CT_PATCH_NONE is not set -CT_PATCH_ORDER="bundled" - -# -# Build behavior -# -CT_PARALLEL_JOBS=0 -CT_LOAD="" -CT_USE_PIPES=y -CT_EXTRA_CFLAGS_FOR_BUILD="" -CT_EXTRA_LDFLAGS_FOR_BUILD="" -CT_EXTRA_CFLAGS_FOR_HOST="" -CT_EXTRA_LDFLAGS_FOR_HOST="" -# CT_CONFIG_SHELL_SH is not set -# CT_CONFIG_SHELL_ASH is not set -CT_CONFIG_SHELL_BASH=y -# CT_CONFIG_SHELL_CUSTOM is not set -CT_CONFIG_SHELL="${bash}" - -# -# Logging -# -# CT_LOG_ERROR is not set -# CT_LOG_WARN is not set -# CT_LOG_INFO is not set CT_LOG_EXTRA=y -# CT_LOG_ALL is not set -# CT_LOG_DEBUG is not set -CT_LOG_LEVEL_MAX="EXTRA" -# CT_LOG_SEE_TOOLS_WARN is not set -# CT_LOG_PROGRESS_BAR is not set -CT_LOG_TO_FILE=y -CT_LOG_FILE_COMPRESS=y - -# -# Target options -# -CT_ARCH="nios2" -CT_ARCH_SUPPORTS_32=y -CT_ARCH_SUPPORTS_WITH_CPU=y -CT_ARCH_DEFAULT_LE=y -CT_ARCH_DEFAULT_32=y -CT_ARCH_CPU="" -CT_ARCH_32=y -CT_ARCH_BITNESS=32 -CT_TARGET_CFLAGS="" -CT_TARGET_LDFLAGS="" -# CT_ARCH_alpha is not set -# CT_ARCH_arm is not set -# CT_ARCH_avr32 is not set -# CT_ARCH_blackfin is not set -# CT_ARCH_m68k is not set -# CT_ARCH_microblaze is not set -# CT_ARCH_mips is not set CT_ARCH_nios2=y -# CT_ARCH_powerpc is not set -# CT_ARCH_s390 is not set -# CT_ARCH_sh is not set -# CT_ARCH_sparc is not set -# CT_ARCH_x86 is not set -CT_ARCH_alpha_AVAILABLE=y -CT_ARCH_arm_AVAILABLE=y -CT_ARCH_avr32_AVAILABLE=y -CT_ARCH_blackfin_AVAILABLE=y -CT_ARCH_m68k_AVAILABLE=y -CT_ARCH_microblaze_AVAILABLE=y -CT_ARCH_mips_AVAILABLE=y -CT_ARCH_nios2_AVAILABLE=y -CT_ARCH_powerpc_AVAILABLE=y -CT_ARCH_s390_AVAILABLE=y -CT_ARCH_sh_AVAILABLE=y -CT_ARCH_sparc_AVAILABLE=y -CT_ARCH_x86_AVAILABLE=y -CT_ARCH_SUFFIX="" - -# -# Generic target options -# CT_MULTILIB=y - -# -# Target optimisations -# -CT_ARCH_FLOAT="" - -# -# Toolchain options -# - -# -# General toolchain options -# -CT_FORCE_SYSROOT=y -CT_USE_SYSROOT=y -CT_SYSROOT_NAME="sysroot" -CT_SYSROOT_DIR_PREFIX="" -CT_WANTS_STATIC_LINK=y CT_STATIC_TOOLCHAIN=y -CT_TOOLCHAIN_PKGVERSION="" CT_TOOLCHAIN_BUGURL="https://bitbucket.org/netzimme/eax-gcc/issues?status=new&status=open" - -# -# Tuple completion and aliasing -# CT_TARGET_VENDOR="spico" -CT_TARGET_ALIAS_SED_EXPR="" -CT_TARGET_ALIAS="" - -# -# Toolchain type -# -# CT_NATIVE is not set -# CT_CROSS is not set -# CT_CROSS_NATIVE is not set CT_CANADIAN=y -CT_TOOLCHAIN_TYPE="canadian" - -# -# Build system -# -CT_BUILD="" -CT_BUILD_PREFIX="" -CT_BUILD_SUFFIX="" - -# -# Host system -# CT_HOST="i686-w64-mingw32" -CT_HOST_PREFIX="" -CT_HOST_SUFFIX="" - -# -# Misc options -# -# CT_TOOLCHAIN_ENABLE_NLS is not set - -# -# Operating System -# -CT_BARE_METAL=y -CT_KERNEL="bare-metal" -CT_KERNEL_bare_metal=y -# CT_KERNEL_linux is not set -CT_KERNEL_bare_metal_AVAILABLE=y -CT_KERNEL_linux_AVAILABLE=y -CT_KERNEL_windows_AVAILABLE=y - -# -# Common kernel options -# - -# -# Binary utilities -# -CT_ARCH_BINFMT_ELF=y -# CT_ARCH_BINFMT_FLAT is not set -# CT_ARCH_BINFMT_FDPIC is not set -CT_BINUTILS="binutils" -CT_BINUTILS_binutils=y - -# -# GNU binutils -# -# CT_BINUTILS_LINARO_V_2_25 is not set CT_BINUTILS_V_2_25=y -# CT_BINUTILS_LINARO_V_2_24 is not set -# CT_BINUTILS_V_2_24 is not set -# CT_BINUTILS_V_2_23_2 is not set -# CT_BINUTILS_V_2_23_1 is not set -# CT_BINUTILS_V_2_22 is not set -# CT_BINUTILS_V_2_21_53 is not set -# CT_BINUTILS_V_2_21_1a is not set -# CT_BINUTILS_V_2_20_1a is not set -# CT_BINUTILS_V_2_19_1a is not set -# CT_BINUTILS_V_2_18a is not set -# CT_BINUTILS_CUSTOM is not set -CT_BINUTILS_VERSION="2.25" -CT_BINUTILS_2_25_or_later=y -CT_BINUTILS_2_24_or_later=y -CT_BINUTILS_2_23_or_later=y -CT_BINUTILS_2_22_or_later=y -CT_BINUTILS_2_21_or_later=y -CT_BINUTILS_2_20_or_later=y -CT_BINUTILS_2_19_or_later=y -CT_BINUTILS_2_18_or_later=y -CT_BINUTILS_HAS_HASH_STYLE=y -CT_BINUTILS_HAS_GOLD=y -CT_BINUTILS_HAS_PLUGINS=y -CT_BINUTILS_HAS_PKGVERSION_BUGURL=y -CT_BINUTILS_LINKER_LD=y -CT_BINUTILS_LINKERS_LIST="ld" -CT_BINUTILS_LINKER_DEFAULT="bfd" -CT_BINUTILS_EXTRA_CONFIG_ARRAY="" - -# -# binutils other options -# - -# -# C-library -# -CT_LIBC="newlib" -CT_LIBC_VERSION="2.2.0" -CT_LIBC_newlib=y -# CT_LIBC_none is not set -CT_THREADS="none" -CT_LIBC_glibc_AVAILABLE=y -CT_LIBC_mingw_AVAILABLE=y -CT_LIBC_musl_AVAILABLE=y -CT_LIBC_newlib_AVAILABLE=y -# CT_LIBC_NEWLIB_LINARO_V_2_2_0 is not set -CT_LIBC_NEWLIB_V_2_2_0=y -# CT_LIBC_NEWLIB_LINARO_V_2_1_0 is not set -# CT_LIBC_NEWLIB_V_2_1_0 is not set -# CT_LIBC_NEWLIB_V_2_0_0 is not set -# CT_LIBC_NEWLIB_V_1_20_0 is not set -# CT_LIBC_NEWLIB_V_1_19_0 is not set -# CT_LIBC_NEWLIB_V_1_18_0 is not set -# CT_LIBC_NEWLIB_V_1_17_0 is not set -# CT_LIBC_NEWLIB_CUSTOM is not set - -# -# Architecture specific options -# -CT_LIBC_none_AVAILABLE=y -CT_LIBC_uClibc_AVAILABLE=y -CT_LIBC_SUPPORT_THREADS_NONE=y - -# -# Common C library options -# -CT_THREADS_NONE=y - -# -# newlib other options -# -# CT_LIBC_NEWLIB_IO_C99FMT is not set -# CT_LIBC_NEWLIB_IO_LL is not set -# CT_LIBC_NEWLIB_IO_FLOAT is not set -# CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS is not set -CT_LIBC_NEWLIB_ENABLE_TARGET_OPTSPACE=y -CT_LIBC_NEWLIB_EXTRA_CONFIG_ARRAY="" - -# -# C compiler -# -CT_CC="gcc" -CT_CC_VERSION="4.9.2" -CT_CC_CORE_PASSES_NEEDED=y -CT_CC_CORE_PASS_1_NEEDED=y -CT_CC_CORE_PASS_2_NEEDED=y -CT_CC_gcc=y -# CT_CC_GCC_SHOW_LINARO is not set -CT_CC_V_4_9_2=y -# CT_CC_V_4_9_1 is not set -# CT_CC_V_4_9_0 is not set -# CT_CC_V_4_8_4 is not set -# CT_CC_V_4_8_3 is not set -# CT_CC_V_4_8_2 is not set -# CT_CC_V_4_8_1 is not set -# CT_CC_V_4_8_0 is not set -# CT_CC_V_4_7_4 is not set -# CT_CC_V_4_7_3 is not set -# CT_CC_V_4_7_2 is not set -# CT_CC_V_4_7_1 is not set -# CT_CC_V_4_7_0 is not set -# CT_CC_V_4_6_4 is not set -# CT_CC_V_4_6_3 is not set -# CT_CC_V_4_6_2 is not set -# CT_CC_V_4_6_1 is not set -# CT_CC_V_4_6_0 is not set -# CT_CC_V_4_5_3 is not set -# CT_CC_V_4_5_2 is not set -# CT_CC_V_4_5_1 is not set -# CT_CC_V_4_5_0 is not set -# CT_CC_V_4_4_7 is not set -# CT_CC_V_4_4_6 is not set -# CT_CC_V_4_4_5 is not set -# CT_CC_V_4_4_4 is not set -# CT_CC_V_4_4_3 is not set -# CT_CC_V_4_4_2 is not set -# CT_CC_V_4_4_1 is not set -# CT_CC_V_4_4_0 is not set -# CT_CC_V_4_3_6 is not set -# CT_CC_V_4_3_5 is not set -# CT_CC_V_4_3_4 is not set -# CT_CC_V_4_3_3 is not set -# CT_CC_V_4_3_2 is not set -# CT_CC_V_4_3_1 is not set -# CT_CC_V_4_2_4 is not set -# CT_CC_V_4_2_2 is not set -# CT_CC_CUSTOM is not set -CT_CC_GCC_4_2_or_later=y -CT_CC_GCC_4_3_or_later=y -CT_CC_GCC_4_4_or_later=y -CT_CC_GCC_4_5_or_later=y -CT_CC_GCC_4_6_or_later=y -CT_CC_GCC_4_7_or_later=y -CT_CC_GCC_4_8_or_later=y -CT_CC_GCC_4_9=y -CT_CC_GCC_4_9_or_later=y -CT_CC_GCC_HAS_GRAPHITE=y -CT_CC_GCC_USE_GRAPHITE=y -CT_CC_GCC_HAS_LTO=y -CT_CC_GCC_USE_LTO=y -CT_CC_GCC_HAS_PKGVERSION_BUGURL=y -CT_CC_GCC_HAS_BUILD_ID=y -CT_CC_GCC_HAS_LNK_HASH_STYLE=y -CT_CC_GCC_USE_GMP_MPFR=y -CT_CC_GCC_USE_MPC=y -CT_CC_GCC_HAS_LIBQUADMATH=y -CT_CC_GCC_HAS_LIBSANITIZER=y -# CT_CC_LANG_FORTRAN is not set -CT_CC_SUPPORT_CXX=y -CT_CC_SUPPORT_FORTRAN=y -CT_CC_SUPPORT_JAVA=y -CT_CC_SUPPORT_ADA=y -CT_CC_SUPPORT_OBJC=y -CT_CC_SUPPORT_OBJCXX=y -CT_CC_SUPPORT_GOLANG=y - -# -# Additional supported languages: -# -CT_CC_LANG_CXX=y - -# -# gcc other options -# -CT_CC_ENABLE_CXX_FLAGS="" -CT_CC_CORE_EXTRA_CONFIG_ARRAY="" -CT_CC_EXTRA_CONFIG_ARRAY="" -CT_CC_STATIC_LIBSTDCXX=y CT_CC_GCC_SYSTEM_ZLIB=y - -# -# Optimisation features -# - -# -# Settings for libraries running on target -# -CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y -# CT_CC_GCC_LIBMUDFLAP is not set -# CT_CC_GCC_LIBGOMP is not set -# CT_CC_GCC_LIBSSP is not set -# CT_CC_GCC_LIBQUADMATH is not set - -# -# Misc. obscure options. -# -# CT_CC_GCC_DISABLE_PCH is not set -CT_CC_GCC_LDBL_128=m -# CT_CC_GCC_BUILD_ID is not set -CT_CC_GCC_LNK_HASH_STYLE_DEFAULT=y -# CT_CC_GCC_LNK_HASH_STYLE_SYSV is not set -# CT_CC_GCC_LNK_HASH_STYLE_GNU is not set -# CT_CC_GCC_LNK_HASH_STYLE_BOTH is not set -CT_CC_GCC_LNK_HASH_STYLE="" -CT_CC_GCC_DEC_FLOAT_AUTO=y -# CT_CC_GCC_DEC_FLOAT_BID is not set -# CT_CC_GCC_DEC_FLOAT_DPD is not set -# CT_CC_GCC_DEC_FLOATS_NO is not set - -# -# Debug facilities -# -# CT_DEBUG_dmalloc is not set -# CT_DEBUG_duma is not set +CT_CC_LANG_CXX=y CT_DEBUG_gdb=y -CT_GDB_CROSS=y -CT_GDB_CROSS_STATIC=y -# CT_GDB_CROSS_SIM is not set -CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="" - -# -# In bare-metal, you'll need to -# - -# -# provide your own gdbserver stub. -# - -# -# gdb version -# -# CT_DEBUG_GDB_SHOW_LINARO is not set CT_GDB_V_7_8_1=y -# CT_GDB_V_7_8 is not set -# CT_GDB_V_7_7_1 is not set -# CT_GDB_V_7_7 is not set -# CT_GDB_V_7_6_1 is not set -# CT_GDB_V_7_5_1 is not set -# CT_GDB_V_7_4_1 is not set -# CT_GDB_V_7_4 is not set -# CT_GDB_V_7_3_1 is not set -# CT_GDB_V_7_3a is not set -# CT_GDB_V_7_2a is not set -# CT_GDB_V_7_1a is not set -# CT_GDB_V_7_0_1a is not set -# CT_GDB_V_7_0a is not set -# CT_GDB_V_6_8a is not set -# CT_GDB_CUSTOM is not set -CT_GDB_7_2_or_later=y -CT_GDB_7_0_or_later=y -CT_GDB_HAS_PKGVERSION_BUGURL=y -CT_GDB_HAS_PYTHON=y -CT_GDB_INSTALL_GDBINIT=y -CT_GDB_VERSION="7.8.1" -# CT_DEBUG_ltrace is not set -# CT_DEBUG_strace is not set - -# -# Companion libraries -# -CT_COMPLIBS_NEEDED=y -CT_GMP_NEEDED=y -CT_MPFR_NEEDED=y -CT_ISL_NEEDED=y -CT_CLOOG_NEEDED=y -CT_MPC_NEEDED=y -CT_COMPLIBS=y -CT_GMP=y -CT_MPFR=y -CT_ISL=y -CT_CLOOG=y -CT_MPC=y -CT_GMP_V_6_0_0=y -# CT_GMP_V_5_1_3 is not set -# CT_GMP_V_5_1_1 is not set -# CT_GMP_V_5_0_2 is not set -# CT_GMP_V_5_0_1 is not set -# CT_GMP_V_4_3_2 is not set -# CT_GMP_V_4_3_1 is not set -# CT_GMP_V_4_3_0 is not set -CT_GMP_5_0_2_or_later=y -CT_GMP_VERSION="6.0.0a" CT_MPFR_V_3_1_2=y -# CT_MPFR_V_3_1_0 is not set -# CT_MPFR_V_3_0_1 is not set -# CT_MPFR_V_3_0_0 is not set -# CT_MPFR_V_2_4_2 is not set -# CT_MPFR_V_2_4_1 is not set -# CT_MPFR_V_2_4_0 is not set -CT_MPFR_VERSION="3.1.2" CT_ISL_V_0_12_2=y -# CT_ISL_V_0_11_1 is not set -CT_ISL_VERSION="0.12.2" -CT_CLOOG_V_0_18_1=y -# CT_CLOOG_V_0_18_0 is not set -CT_CLOOG_VERSION="0.18.1" -CT_CLOOG_0_18_or_later=y CT_MPC_V_1_0_2=y -# CT_MPC_V_1_0_1 is not set -# CT_MPC_V_1_0 is not set -# CT_MPC_V_0_9 is not set -# CT_MPC_V_0_8_2 is not set -# CT_MPC_V_0_8_1 is not set -# CT_MPC_V_0_7 is not set -CT_MPC_VERSION="1.0.2" - -# -# Companion libraries common options -# -# CT_COMPLIBS_CHECK is not set - -# -# Companion tools -# - -# -# READ HELP before you say 'Y' below !!! -# -# CT_COMP_TOOLS is not set - -# -# Test suite -# -# CT_TEST_SUITE_GCC is not set -- cgit v0.10.2-6-g49f6 From 580f300ad9fbc9abbb6fcb1f037c352f0981b091 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 27 Oct 2015 23:28:41 -0700 Subject: Disable with-system-lib. Target does not have libz/zlib.h. Signed-off-by: Alexey Neyman diff --git a/samples/nios2-elf-mingw32/crosstool.config b/samples/nios2-elf-mingw32/crosstool.config index 4f7c39b..3a989db 100644 --- a/samples/nios2-elf-mingw32/crosstool.config +++ b/samples/nios2-elf-mingw32/crosstool.config @@ -11,7 +11,6 @@ CT_TARGET_VENDOR="spico" CT_CANADIAN=y CT_HOST="i686-w64-mingw32" CT_BINUTILS_V_2_25=y -CT_CC_GCC_SYSTEM_ZLIB=y CT_CC_LANG_CXX=y CT_DEBUG_gdb=y CT_GDB_V_7_8_1=y -- cgit v0.10.2-6-g49f6 From 444db621a3e69247c958f684fae823038c7db8f8 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 27 Oct 2015 21:42:11 -0700 Subject: Disable cross-gdb in nios2-elf-mingw32. Building cross-gdb in canadian cross requires expat/ncurses for the host. Currently, 300-gdb.sh only builds expat/ncurses for the target (for native-gdb). For cross-gdb on regular cross (build==host), expat and ncurses are expected to be provided by the host. There are two approaches possible: - If building for canadian cross, build expat/ncurses for cross-gdb just as the native-gdb does. - Promote expat/ncurses to first class citizens and build them as companion libs during the build of the build-to-host toolchain. I am leaning towards the latter approach - it would also allow to specify the versions for expat/ncurses rather than have them hardcoded in 300-gdb.sh - but would appreciate feedback. Signed-off-by: Alexey Neyman diff --git a/samples/nios2-elf-mingw32/crosstool.config b/samples/nios2-elf-mingw32/crosstool.config index 3a989db..b23fc35 100644 --- a/samples/nios2-elf-mingw32/crosstool.config +++ b/samples/nios2-elf-mingw32/crosstool.config @@ -13,7 +13,7 @@ CT_HOST="i686-w64-mingw32" CT_BINUTILS_V_2_25=y CT_CC_LANG_CXX=y CT_DEBUG_gdb=y -CT_GDB_V_7_8_1=y +# CT_GDB_CROSS is not set CT_MPFR_V_3_1_2=y CT_ISL_V_0_12_2=y CT_MPC_V_1_0_2=y -- cgit v0.10.2-6-g49f6 From 34c57c56fdde70db759d419caee5c37b645b7772 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 27 Oct 2015 22:13:43 -0700 Subject: Turn off CT_MULTILIB in nios2-elf-mingw32. There are no multilibs in GCC configured for this arch. Signed-off-by: Alexey Neyman diff --git a/samples/nios2-elf-mingw32/crosstool.config b/samples/nios2-elf-mingw32/crosstool.config index b23fc35..167df55 100644 --- a/samples/nios2-elf-mingw32/crosstool.config +++ b/samples/nios2-elf-mingw32/crosstool.config @@ -4,7 +4,6 @@ CT_SAVE_TARBALLS=y # CT_REMOVE_DOCS is not set CT_LOG_EXTRA=y CT_ARCH_nios2=y -CT_MULTILIB=y CT_STATIC_TOOLCHAIN=y CT_TOOLCHAIN_BUGURL="https://bitbucket.org/netzimme/eax-gcc/issues?status=new&status=open" CT_TARGET_VENDOR="spico" -- cgit v0.10.2-6-g49f6