* [Buildroot] [PATCH 1/5] toolchain: move helper functions from external toolchain
2010-06-01 21:52 [Buildroot] [pull request] Preparatory work on toolchains Yann E. MORIN
@ 2010-06-01 21:52 ` Yann E. MORIN
2010-06-01 21:53 ` [Buildroot] [PATCH 2/5] toolchain: rename external toolchain dir Yann E. MORIN
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2010-06-01 21:52 UTC (permalink / raw)
To: buildroot
The helper functions used for external toolchains may also be useful
to alternate toolchain backends (currently, only external toolchain
is the sole user).
Signed-off-by: Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
---
Makefile | 1 +
toolchain/external-toolchain/ext-tool.mk | 214 -----------------------------
toolchain/helpers.mk | 217 ++++++++++++++++++++++++++++++
3 files changed, 218 insertions(+), 214 deletions(-)
create mode 100644 toolchain/helpers.mk
diff --git a/Makefile b/Makefile
index e36b475..68cfebf 100644
--- a/Makefile
+++ b/Makefile
@@ -305,6 +305,7 @@ include toolchain/mklibs/mklibs.mk
include toolchain/sstrip/sstrip.mk
include toolchain/uClibc/uclibc.mk
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+include toolchain/helpers.mk
include toolchain/*/*.mk
endif
diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk
index 8daae15..c8e7892 100644
--- a/toolchain/external-toolchain/ext-tool.mk
+++ b/toolchain/external-toolchain/ext-tool.mk
@@ -35,220 +35,6 @@
# cross-compiler binaries remains external, all libraries and headers
# are imported into the Buildroot tree.
-#
-# Copy a toolchain library and its symbolic links from the sysroot
-# directory to the target directory. Also optionaly strips the
-# library.
-#
-# $1: arch specific sysroot directory
-# $2: library name
-# $3: destination directory
-# $4: strip (y|n), default is to strip
-#
-copy_toolchain_lib_root = \
- ARCH_SYSROOT_DIR="$(strip $1)"; \
- LIB="$(strip $2)"; \
- STRIP="$(strip $4)"; \
- \
- LIBS=`(cd $${ARCH_SYSROOT_DIR}; find . -path "./lib/$${LIB}.*" -o -path "./usr/lib/$${LIB}.*")` ; \
- for FILE in $${LIBS} ; do \
- LIB=`basename $${FILE}`; \
- LIBDIR=`dirname $${FILE}` ; \
- while test \! -z "$${LIB}"; do \
- FULLPATH="$${ARCH_SYSROOT_DIR}/$${LIBDIR}/$${LIB}" ; \
- rm -fr $(TARGET_DIR)/$${LIBDIR}/$${LIB}; \
- mkdir -p $(TARGET_DIR)/$${LIBDIR}; \
- if test -h $${FULLPATH} ; then \
- cp -d $${FULLPATH} $(TARGET_DIR)/$${LIBDIR}/; \
- elif test -f $${FULLPATH}; then \
- $(INSTALL) -D -m0755 $${FULLPATH} $(TARGET_DIR)/$${LIBDIR}/$${LIB}; \
- case "$${STRIP}" in \
- (0 | n | no) \
-;; \
- (*) \
- $(TARGET_CROSS)strip "$(TARGET_DIR)/$${LIBDIR}/$${LIB}"; \
-;; \
- esac; \
- else \
- exit -1; \
- fi; \
- LIB="`readlink $${FULLPATH}`"; \
- done; \
- done; \
- \
- echo -n
-
-#
-# Copy the full external toolchain sysroot directory to the staging
-# dir. The operation of this function is rendered a little bit
-# complicated by the support for multilib toolchains.
-#
-# We start by copying etc, lib, sbin and usr from the sysroot of the
-# selected architecture variant (as pointed by ARCH_SYSROOT_DIR). This
-# allows to import into the staging directory the C library and
-# companion libraries for the correct architecture variant. We
-# explictly only copy etc, lib, sbin and usr since other directories
-# might exist for other architecture variants (on Codesourcery
-# toolchain, the sysroot for the default architecture variant contains
-# the armv4t and thumb2 subdirectories, which are the sysroot for the
-# corresponding architecture variants), and we don't want to import
-# them.
-#
-# Then, if the selected architecture variant is not the default one
-# (i.e, if SYSROOT_DIR != ARCH_SYSROOT_DIR), then we :
-#
-# * Import the header files from the default architecture
-# variant. Header files are typically shared between the sysroots
-# for the different architecture variants. If we use the
-# non-default one, header files were not copied by the previous
-# step, so we copy them here from the sysroot of the default
-# architecture variant.
-#
-# * Create a symbolic link that matches the name of the subdirectory
-# for the architecture variant in the original sysroot. This is
-# required as the compiler will by default look in
-# sysroot_dir/arch_variant/ for libraries and headers, when the
-# non-default architecture variant is used. Without this, the
-# compiler fails to find libraries and headers.
-#
-# $1: main sysroot directory of the toolchain
-# $2: arch specific sysroot directory of the toolchain
-# $3: arch specific subdirectory in the sysroot
-#
-copy_toolchain_sysroot = \
- SYSROOT_DIR="$(strip $1)"; \
- ARCH_SYSROOT_DIR="$(strip $2)"; \
- ARCH_SUBDIR="$(strip $3)"; \
- for i in etc lib sbin usr ; do \
- cp -a $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
- done ; \
- if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \
- if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \
- cp -a $${SYSROOT_DIR}/usr/include $(STAGING_DIR)/usr ; \
- fi ; \
- ln -s . $(STAGING_DIR)/$(ARCH_SUBDIR) ; \
- fi ; \
- find $(STAGING_DIR) -type d | xargs chmod 755
-
-#
-# Check the availability of a particular glibc feature. We assume that
-# all Buildroot toolchain options are supported by glibc, so we just
-# check that they are enabled.
-#
-# $1: Buildroot option name
-# $2: feature description
-#
-check_glibc_feature = \
- if [ x$($(1)) != x"y" ] ; then \
- echo "$(2) available in C library, please enable $(1)" ; \
- exit 1 ; \
- fi
-
-#
-# Check the correctness of a glibc external toolchain configuration.
-# 1. Check that the C library selected in Buildroot matches the one
-# of the external toolchain
-# 2. Check that all the C library-related features are enabled in the
-# config, since glibc always supports all of them
-#
-# $1: sysroot directory
-#
-check_glibc = \
- SYSROOT_DIR="$(strip $1)"; \
- if ! test -f $${SYSROOT_DIR}/lib/ld-linux.so.* ; then \
- echo "Incorrect selection of the C library"; \
- exit -1; \
- fi; \
- $(call check_glibc_feature,BR2_LARGEFILE,Large file support) ;\
- $(call check_glibc_feature,BR2_INET_IPV6,IPv6 support) ;\
- $(call check_glibc_feature,BR2_INET_RPC,RPC support) ;\
- $(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
- $(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) ;\
- $(call check_glibc_feature,BR2_PROGRAM_INVOCATION,Program invocation support)
-
-#
-# Check the conformity of Buildroot configuration with regard to the
-# uClibc configuration of the external toolchain, for a particular
-# feature.
-#
-# $1: uClibc macro name
-# $2: Buildroot option name
-# $3: uClibc config file
-# $4: feature description
-#
-check_uclibc_feature = \
- IS_IN_LIBC=`grep -q "\#define $(1) 1" $(3) && echo y` ; \
- if [ x$($(2)) != x"y" -a x$${IS_IN_LIBC} == x"y" ] ; then \
- echo "$(4) available in C library, please enable $(2)" ; \
- exit 1 ; \
- fi ; \
- if [ x$($(2)) == x"y" -a x$${IS_IN_LIBC} != x"y" ] ; then \
- echo "$(4) not available in C library, please disable $(2)" ; \
- exit 1 ; \
- fi
-
-#
-# Check the correctness of a uclibc external toolchain configuration
-# 1. Check that the C library selected in Buildroot matches the one
-# of the external toolchain
-# 2. Check that the features enabled in the Buildroot configuration
-# match the features available in the uClibc of the external
-# toolchain
-#
-# $1: sysroot directory
-#
-check_uclibc = \
- SYSROOT_DIR="$(strip $1)"; \
- if ! test -f $${SYSROOT_DIR}/lib/ld-uClibc.so.* ; then \
- echo "Incorrect selection of the C library"; \
- exit -1; \
- fi; \
- UCLIBC_CONFIG_FILE=$${SYSROOT_DIR}/usr/include/bits/uClibc_config.h ; \
- $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\
- $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
- $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_INET_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
- $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
- $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\
- $(call check_uclibc_feature,__UCLIBC_HAS_PROGRAM_INVOCATION_NAME__,BR2_PROGRAM_INVOCATION,$${UCLIBC_CONFIG_FILE},Program invocation support) ;\
-
-#
-# Check that the Buildroot configuration of the ABI matches the
-# configuration of the external toolchain.
-#
-check_arm_abi = \
- EXT_TOOLCHAIN_TARGET=$(shell LANG=C $(TARGET_CC) -v 2>&1 | grep ^Target | cut -f2 -d ' ') ; \
- if echo $${EXT_TOOLCHAIN_TARGET} | grep -q 'eabi$$' ; then \
- EXT_TOOLCHAIN_ABI="eabi" ; \
- else \
- EXT_TOOLCHAIN_ABI="oabi" ; \
- fi ; \
- if [ x$(BR2_ARM_OABI) == x"y" -a $${EXT_TOOLCHAIN_ABI} == "eabi" ] ; then \
- echo "Incorrect ABI setting" ; \
- exit 1 ; \
- fi ; \
- if [ x$(BR2_ARM_EABI) == x"y" -a $${EXT_TOOLCHAIN_ABI} == "oabi" ] ; then \
- echo "Incorrect ABI setting" ; \
- exit 1 ; \
- fi ; \
-
-#
-# Check that the external toolchain supports C++
-#
-check_cplusplus = \
- if ! test -x $(TARGET_CXX) ; then \
- echo "BR2_INSTALL_LIBSTDCPP is selected but C++ support not available in external toolchain" ; \
- exit 1 ; \
- fi ; \
-
-#
-# Check that the cross-compiler given in the configuration exists
-#
-check_cross_compiler_exists = \
- if ! test -x $(TARGET_CC) ; then \
- echo "Cannot find cross-compiler $(TARGET_CC)" ; \
- exit 1 ; \
- fi ; \
-
uclibc: dependencies $(STAMP_DIR)/ext-toolchain-installed
EXTERNAL_LIBS=libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
new file mode 100644
index 0000000..2c7d34c
--- /dev/null
+++ b/toolchain/helpers.mk
@@ -0,0 +1,217 @@
+# This Makefile fragment declares helper functions, usefull to handle
+# non- buildroot-built toolchains, eg. purely external toolchains or
+# toolchains (internally) built using crosstool-NG.
+
+#
+# Copy a toolchain library and its symbolic links from the sysroot
+# directory to the target directory. Also optionaly strips the
+# library.
+#
+# $1: arch specific sysroot directory
+# $2: library name
+# $3: destination directory
+# $4: strip (y|n), default is to strip
+#
+copy_toolchain_lib_root = \
+ ARCH_SYSROOT_DIR="$(strip $1)"; \
+ LIB="$(strip $2)"; \
+ STRIP="$(strip $4)"; \
+ \
+ LIBS=`(cd $${ARCH_SYSROOT_DIR}; find . -path "./lib/$${LIB}.*" -o -path "./usr/lib/$${LIB}.*")` ; \
+ for FILE in $${LIBS} ; do \
+ LIB=`basename $${FILE}`; \
+ LIBDIR=`dirname $${FILE}` ; \
+ while test \! -z "$${LIB}"; do \
+ FULLPATH="$${ARCH_SYSROOT_DIR}/$${LIBDIR}/$${LIB}" ; \
+ rm -fr $(TARGET_DIR)/$${LIBDIR}/$${LIB}; \
+ mkdir -p $(TARGET_DIR)/$${LIBDIR}; \
+ if test -h $${FULLPATH} ; then \
+ cp -d $${FULLPATH} $(TARGET_DIR)/$${LIBDIR}/; \
+ elif test -f $${FULLPATH}; then \
+ $(INSTALL) -D -m0755 $${FULLPATH} $(TARGET_DIR)/$${LIBDIR}/$${LIB}; \
+ case "$${STRIP}" in \
+ (0 | n | no) \
+;; \
+ (*) \
+ $(TARGET_CROSS)strip "$(TARGET_DIR)/$${LIBDIR}/$${LIB}"; \
+;; \
+ esac; \
+ else \
+ exit -1; \
+ fi; \
+ LIB="`readlink $${FULLPATH}`"; \
+ done; \
+ done; \
+ \
+ echo -n
+
+#
+# Copy the full external toolchain sysroot directory to the staging
+# dir. The operation of this function is rendered a little bit
+# complicated by the support for multilib toolchains.
+#
+# We start by copying etc, lib, sbin and usr from the sysroot of the
+# selected architecture variant (as pointed by ARCH_SYSROOT_DIR). This
+# allows to import into the staging directory the C library and
+# companion libraries for the correct architecture variant. We
+# explictly only copy etc, lib, sbin and usr since other directories
+# might exist for other architecture variants (on Codesourcery
+# toolchain, the sysroot for the default architecture variant contains
+# the armv4t and thumb2 subdirectories, which are the sysroot for the
+# corresponding architecture variants), and we don't want to import
+# them.
+#
+# Then, if the selected architecture variant is not the default one
+# (i.e, if SYSROOT_DIR != ARCH_SYSROOT_DIR), then we :
+#
+# * Import the header files from the default architecture
+# variant. Header files are typically shared between the sysroots
+# for the different architecture variants. If we use the
+# non-default one, header files were not copied by the previous
+# step, so we copy them here from the sysroot of the default
+# architecture variant.
+#
+# * Create a symbolic link that matches the name of the subdirectory
+# for the architecture variant in the original sysroot. This is
+# required as the compiler will by default look in
+# sysroot_dir/arch_variant/ for libraries and headers, when the
+# non-default architecture variant is used. Without this, the
+# compiler fails to find libraries and headers.
+#
+# $1: main sysroot directory of the toolchain
+# $2: arch specific sysroot directory of the toolchain
+# $3: arch specific subdirectory in the sysroot
+#
+copy_toolchain_sysroot = \
+ SYSROOT_DIR="$(strip $1)"; \
+ ARCH_SYSROOT_DIR="$(strip $2)"; \
+ ARCH_SUBDIR="$(strip $3)"; \
+ for i in etc lib sbin usr ; do \
+ cp -a $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
+ done ; \
+ if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \
+ if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \
+ cp -a $${SYSROOT_DIR}/usr/include $(STAGING_DIR)/usr ; \
+ fi ; \
+ ln -s . $(STAGING_DIR)/$(ARCH_SUBDIR) ; \
+ fi ; \
+ find $(STAGING_DIR) -type d | xargs chmod 755
+
+#
+# Check the availability of a particular glibc feature. We assume that
+# all Buildroot toolchain options are supported by glibc, so we just
+# check that they are enabled.
+#
+# $1: Buildroot option name
+# $2: feature description
+#
+check_glibc_feature = \
+ if [ x$($(1)) != x"y" ] ; then \
+ echo "$(2) available in C library, please enable $(1)" ; \
+ exit 1 ; \
+ fi
+
+#
+# Check the correctness of a glibc external toolchain configuration.
+# 1. Check that the C library selected in Buildroot matches the one
+# of the external toolchain
+# 2. Check that all the C library-related features are enabled in the
+# config, since glibc always supports all of them
+#
+# $1: sysroot directory
+#
+check_glibc = \
+ SYSROOT_DIR="$(strip $1)"; \
+ if ! test -f $${SYSROOT_DIR}/lib/ld-linux.so.* ; then \
+ echo "Incorrect selection of the C library"; \
+ exit -1; \
+ fi; \
+ $(call check_glibc_feature,BR2_LARGEFILE,Large file support) ;\
+ $(call check_glibc_feature,BR2_INET_IPV6,IPv6 support) ;\
+ $(call check_glibc_feature,BR2_INET_RPC,RPC support) ;\
+ $(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
+ $(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) ;\
+ $(call check_glibc_feature,BR2_PROGRAM_INVOCATION,Program invocation support)
+
+#
+# Check the conformity of Buildroot configuration with regard to the
+# uClibc configuration of the external toolchain, for a particular
+# feature.
+#
+# $1: uClibc macro name
+# $2: Buildroot option name
+# $3: uClibc config file
+# $4: feature description
+#
+check_uclibc_feature = \
+ IS_IN_LIBC=`grep -q "\#define $(1) 1" $(3) && echo y` ; \
+ if [ x$($(2)) != x"y" -a x$${IS_IN_LIBC} == x"y" ] ; then \
+ echo "$(4) available in C library, please enable $(2)" ; \
+ exit 1 ; \
+ fi ; \
+ if [ x$($(2)) == x"y" -a x$${IS_IN_LIBC} != x"y" ] ; then \
+ echo "$(4) not available in C library, please disable $(2)" ; \
+ exit 1 ; \
+ fi
+
+#
+# Check the correctness of a uclibc external toolchain configuration
+# 1. Check that the C library selected in Buildroot matches the one
+# of the external toolchain
+# 2. Check that the features enabled in the Buildroot configuration
+# match the features available in the uClibc of the external
+# toolchain
+#
+# $1: sysroot directory
+#
+check_uclibc = \
+ SYSROOT_DIR="$(strip $1)"; \
+ if ! test -f $${SYSROOT_DIR}/lib/ld-uClibc.so.* ; then \
+ echo "Incorrect selection of the C library"; \
+ exit -1; \
+ fi; \
+ UCLIBC_CONFIG_FILE=$${SYSROOT_DIR}/usr/include/bits/uClibc_config.h ; \
+ $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\
+ $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
+ $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_INET_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
+ $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
+ $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\
+ $(call check_uclibc_feature,__UCLIBC_HAS_PROGRAM_INVOCATION_NAME__,BR2_PROGRAM_INVOCATION,$${UCLIBC_CONFIG_FILE},Program invocation support) ;\
+
+#
+# Check that the Buildroot configuration of the ABI matches the
+# configuration of the external toolchain.
+#
+check_arm_abi = \
+ EXT_TOOLCHAIN_TARGET=$(shell LANG=C $(TARGET_CC) -v 2>&1 | grep ^Target | cut -f2 -d ' ') ; \
+ if echo $${EXT_TOOLCHAIN_TARGET} | grep -q 'eabi$$' ; then \
+ EXT_TOOLCHAIN_ABI="eabi" ; \
+ else \
+ EXT_TOOLCHAIN_ABI="oabi" ; \
+ fi ; \
+ if [ x$(BR2_ARM_OABI) == x"y" -a $${EXT_TOOLCHAIN_ABI} == "eabi" ] ; then \
+ echo "Incorrect ABI setting" ; \
+ exit 1 ; \
+ fi ; \
+ if [ x$(BR2_ARM_EABI) == x"y" -a $${EXT_TOOLCHAIN_ABI} == "oabi" ] ; then \
+ echo "Incorrect ABI setting" ; \
+ exit 1 ; \
+ fi ; \
+
+#
+# Check that the external toolchain supports C++
+#
+check_cplusplus = \
+ if ! test -x $(TARGET_CXX) ; then \
+ echo "BR2_INSTALL_LIBSTDCPP is selected but C++ support not available in external toolchain" ; \
+ exit 1 ; \
+ fi ; \
+
+#
+# Check that the cross-compiler given in the configuration exists
+#
+check_cross_compiler_exists = \
+ if ! test -x $(TARGET_CC) ; then \
+ echo "Cannot find cross-compiler $(TARGET_CC)" ; \
+ exit 1 ; \
+ fi ; \
--
1.6.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 2/5] toolchain: rename external toolchain dir
2010-06-01 21:52 [Buildroot] [pull request] Preparatory work on toolchains Yann E. MORIN
2010-06-01 21:52 ` [Buildroot] [PATCH 1/5] toolchain: move helper functions from external toolchain Yann E. MORIN
@ 2010-06-01 21:53 ` Yann E. MORIN
2010-06-01 21:53 ` [Buildroot] [PATCH 3/5] toolchain: move makefile includes Yann E. MORIN
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2010-06-01 21:53 UTC (permalink / raw)
To: buildroot
Rename the external toolchain directory.
When new backends are here, it will be easier to sort them out
if they are all prefixed the same way.
Signed-off-by: Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
---
toolchain/Config.in | 4 +-
toolchain/external-toolchain/Config.in | 22 ------
toolchain/external-toolchain/Config.in.2 | 17 -----
toolchain/external-toolchain/ext-tool.mk | 108 ------------------------------
toolchain/toolchain-external/Config.in | 22 ++++++
toolchain/toolchain-external/Config.in.2 | 17 +++++
toolchain/toolchain-external/ext-tool.mk | 108 ++++++++++++++++++++++++++++++
7 files changed, 149 insertions(+), 149 deletions(-)
delete mode 100644 toolchain/external-toolchain/Config.in
delete mode 100644 toolchain/external-toolchain/Config.in.2
delete mode 100644 toolchain/external-toolchain/ext-tool.mk
create mode 100644 toolchain/toolchain-external/Config.in
create mode 100644 toolchain/toolchain-external/Config.in.2
create mode 100644 toolchain/toolchain-external/ext-tool.mk
diff --git a/toolchain/Config.in b/toolchain/Config.in
index ee94143..52b9d8b 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -17,7 +17,7 @@ config BR2_TOOLCHAIN_EXTERNAL
endchoice
source "toolchain/Config.in.1"
-source "toolchain/external-toolchain/Config.in"
+source "toolchain/toolchain-external/Config.in"
# we want gdb config in the middle of both source and external
# toolchains, but mconf won't let us source the same file twice,
@@ -26,6 +26,6 @@ source "toolchain/gdb/Config.in"
comment "Common Toolchain Options"
source "toolchain/Config.in.2"
-source "toolchain/external-toolchain/Config.in.2"
+source "toolchain/toolchain-external/Config.in.2"
endmenu
diff --git a/toolchain/external-toolchain/Config.in b/toolchain/external-toolchain/Config.in
deleted file mode 100644
index efc8378..0000000
--- a/toolchain/external-toolchain/Config.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-
-if BR2_TOOLCHAIN_EXTERNAL
-choice
- prompt "External toolchain C library"
- default BR2_TOOLCHAIN_EXTERNAL_UCLIBC
-
-config BR2_TOOLCHAIN_EXTERNAL_UCLIBC
- bool "uClibc"
-
-config BR2_TOOLCHAIN_EXTERNAL_GLIBC
- bool "glibc"
-
-endchoice
-
-config BR2_TOOLCHAIN_EXTERNAL_STRIP
- bool
- default y
- prompt "Strip shared libraries"
- help
- Strip shared libraries copied from the external toolchain.
-endif
diff --git a/toolchain/external-toolchain/Config.in.2 b/toolchain/external-toolchain/Config.in.2
deleted file mode 100644
index 489558c..0000000
--- a/toolchain/external-toolchain/Config.in.2
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-
-if BR2_TOOLCHAIN_EXTERNAL
-config BR2_TOOLCHAIN_EXTERNAL_PATH
- string "External toolchain path"
- default "/path/to/staging_dir/usr"
- help
- Path to where the external toolchain is installed.
-
-config BR2_TOOLCHAIN_EXTERNAL_PREFIX
- string "External toolchain prefix"
- default "$(ARCH)-linux"
- help
- This the the external toolchain prefix. For example:
- armeb-unknown-linux-gnu, mipsel-unknown-linux-gnu, etc.
-
-endif
diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk
deleted file mode 100644
index c8e7892..0000000
--- a/toolchain/external-toolchain/ext-tool.mk
+++ /dev/null
@@ -1,108 +0,0 @@
-
-#
-# This file implements the support for external toolchains, i.e
-# toolchains that have not been produced by Buildroot itself and that
-# are already available on the system on which Buildroot runs. So far,
-# we have tested this with:
-#
-# * Toolchains generated by Crosstool-NG
-# * Toolchains generated by Buildroot
-# * ARM toolchains made available by Codesourcery
-#
-# The basic principle is the following
-#
-# 1. Perform some checks on the conformity between the toolchain
-# configuration described in the Buildroot menuconfig system, and the
-# real configuration of the external toolchain. This is for example
-# important to make sure that the Buildroot configuration system
-# knows whether the toolchain supports RPC, IPv6, locales, large
-# files, etc. Unfortunately, these things cannot be detected
-# automatically, since the value of these options (such as
-# BR2_INET_RPC) are needed at configuration time because these
-# options are used as dependencies for other options. And at
-# configuration time, we are not able to retrieve the external
-# toolchain configuration.
-#
-# 2. Copy the libraries needed at runtime to the target directory,
-# $(TARGET_DIR). Obviously, things such as the C library, the dynamic
-# loader and a few other utility libraries are needed if dynamic
-# applications are to be executed on the target system.
-#
-# 3. Copy the libraries and headers to the staging directory. This
-# will allow all further calls to gcc to be made using --sysroot
-# $(STAGING_DIR), which greatly simplifies the compilation of the
-# packages when using external toolchains. So in the end, only the
-# cross-compiler binaries remains external, all libraries and headers
-# are imported into the Buildroot tree.
-
-uclibc: dependencies $(STAMP_DIR)/ext-toolchain-installed
-
-EXTERNAL_LIBS=libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
-EXTERNAL_LIBS+=ld-uClibc.so
-else
-EXTERNAL_LIBS+=ld-linux.so libnss_files.so libnss_dns.so
-endif
-
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-EXTERNAL_LIBS+=libstdc++.so
-endif
-
-ifneq ($(BR2_PTHREADS_NONE),y)
-EXTERNAL_LIBS+=libpthread.so
-ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
-EXTERNAL_LIBS+=libthread_db.so
-endif # gdbserver
-endif # ! no threads
-
-# SYSROOT_DIR selection. We first try the -print-sysroot option,
-# available in gcc 4.4.x and in some Codesourcery toolchains. If this
-# option is not available, we fallback to the value of --with-sysroot
-# as visible in CROSS-gcc -v. We don't pass the -march= option to gcc
-# as we want the "main" sysroot, which contains all variants of the C
-# library in the case of multilib toolchains.
-SYSROOT_DIR=$(shell $(TARGET_CC) -print-sysroot 2>/dev/null)
-ifeq ($(SYSROOT_DIR),)
-SYSROOT_DIR=$(shell readlink -f $$(LANG=C $(TARGET_CC) -print-file-name=libc.a |sed -r -e 's:usr/lib/libc\.a::;'))
-endif
-
-# Now, find if the toolchain specifies a sub-directory for the
-# specific architecture variant we're interested in. This is the case
-# with multilib toolchain, when the selected architecture variant is
-# not the default one. To do so, we ask the compiler by passing the
-# appropriate -march= flags. ARCH_SUBDIR will contain the
-# subdirectory, in the main SYSROOT_DIR, that corresponds to the
-# selected architecture variant. ARCH_SYSROOT_DIR will contain the
-# full path to this location.
-ifneq ($(CC_TARGET_ARCH_),)
-TARGET_CC_ARCH_CFLAGS+=-march=$(CC_TARGET_ARCH_)
-endif
-ARCH_SUBDIR=$(shell $(TARGET_CC) $(TARGET_CC_ARCH_CFLAGS) -print-multi-directory)
-ARCH_SYSROOT_DIR=$(SYSROOT_DIR)/$(ARCH_SUBDIR)
-
-$(STAMP_DIR)/ext-toolchain-installed:
- @echo "Checking external toolchain settings"
- $(Q)$(call check_cross_compiler_exists)
-ifeq ($(strip $(SYSROOT_DIR)),)
- @echo "External toolchain doesn't support --sysroot. Cannot use."
- exit 1
-endif
-ifeq ($(BR2_arm),y)
- $(Q)$(call check_arm_abi)
-endif
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
- $(Q)$(call check_cplusplus)
-endif
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
- $(Q)$(call check_uclibc,$(SYSROOT_DIR))
-else
- $(Q)$(call check_glibc,$(SYSROOT_DIR))
-endif
- mkdir -p $(TARGET_DIR)/lib
- @echo "Copy external toolchain libraries to target..."
- $(Q)for libs in $(EXTERNAL_LIBS); do \
- $(call copy_toolchain_lib_root,$(ARCH_SYSROOT_DIR),$$libs,$(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \
- done
- @echo "Copy external toolchain sysroot to staging..."
- $(Q)$(call copy_toolchain_sysroot,$(SYSROOT_DIR),$(ARCH_SYSROOT_DIR),$(ARCH_SUBDIR))
- @touch $@
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
new file mode 100644
index 0000000..efc8378
--- /dev/null
+++ b/toolchain/toolchain-external/Config.in
@@ -0,0 +1,22 @@
+#
+
+if BR2_TOOLCHAIN_EXTERNAL
+choice
+ prompt "External toolchain C library"
+ default BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+
+config BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+ bool "uClibc"
+
+config BR2_TOOLCHAIN_EXTERNAL_GLIBC
+ bool "glibc"
+
+endchoice
+
+config BR2_TOOLCHAIN_EXTERNAL_STRIP
+ bool
+ default y
+ prompt "Strip shared libraries"
+ help
+ Strip shared libraries copied from the external toolchain.
+endif
diff --git a/toolchain/toolchain-external/Config.in.2 b/toolchain/toolchain-external/Config.in.2
new file mode 100644
index 0000000..489558c
--- /dev/null
+++ b/toolchain/toolchain-external/Config.in.2
@@ -0,0 +1,17 @@
+#
+
+if BR2_TOOLCHAIN_EXTERNAL
+config BR2_TOOLCHAIN_EXTERNAL_PATH
+ string "External toolchain path"
+ default "/path/to/staging_dir/usr"
+ help
+ Path to where the external toolchain is installed.
+
+config BR2_TOOLCHAIN_EXTERNAL_PREFIX
+ string "External toolchain prefix"
+ default "$(ARCH)-linux"
+ help
+ This the the external toolchain prefix. For example:
+ armeb-unknown-linux-gnu, mipsel-unknown-linux-gnu, etc.
+
+endif
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
new file mode 100644
index 0000000..c8e7892
--- /dev/null
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -0,0 +1,108 @@
+
+#
+# This file implements the support for external toolchains, i.e
+# toolchains that have not been produced by Buildroot itself and that
+# are already available on the system on which Buildroot runs. So far,
+# we have tested this with:
+#
+# * Toolchains generated by Crosstool-NG
+# * Toolchains generated by Buildroot
+# * ARM toolchains made available by Codesourcery
+#
+# The basic principle is the following
+#
+# 1. Perform some checks on the conformity between the toolchain
+# configuration described in the Buildroot menuconfig system, and the
+# real configuration of the external toolchain. This is for example
+# important to make sure that the Buildroot configuration system
+# knows whether the toolchain supports RPC, IPv6, locales, large
+# files, etc. Unfortunately, these things cannot be detected
+# automatically, since the value of these options (such as
+# BR2_INET_RPC) are needed at configuration time because these
+# options are used as dependencies for other options. And at
+# configuration time, we are not able to retrieve the external
+# toolchain configuration.
+#
+# 2. Copy the libraries needed at runtime to the target directory,
+# $(TARGET_DIR). Obviously, things such as the C library, the dynamic
+# loader and a few other utility libraries are needed if dynamic
+# applications are to be executed on the target system.
+#
+# 3. Copy the libraries and headers to the staging directory. This
+# will allow all further calls to gcc to be made using --sysroot
+# $(STAGING_DIR), which greatly simplifies the compilation of the
+# packages when using external toolchains. So in the end, only the
+# cross-compiler binaries remains external, all libraries and headers
+# are imported into the Buildroot tree.
+
+uclibc: dependencies $(STAMP_DIR)/ext-toolchain-installed
+
+EXTERNAL_LIBS=libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
+EXTERNAL_LIBS+=ld-uClibc.so
+else
+EXTERNAL_LIBS+=ld-linux.so libnss_files.so libnss_dns.so
+endif
+
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+EXTERNAL_LIBS+=libstdc++.so
+endif
+
+ifneq ($(BR2_PTHREADS_NONE),y)
+EXTERNAL_LIBS+=libpthread.so
+ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
+EXTERNAL_LIBS+=libthread_db.so
+endif # gdbserver
+endif # ! no threads
+
+# SYSROOT_DIR selection. We first try the -print-sysroot option,
+# available in gcc 4.4.x and in some Codesourcery toolchains. If this
+# option is not available, we fallback to the value of --with-sysroot
+# as visible in CROSS-gcc -v. We don't pass the -march= option to gcc
+# as we want the "main" sysroot, which contains all variants of the C
+# library in the case of multilib toolchains.
+SYSROOT_DIR=$(shell $(TARGET_CC) -print-sysroot 2>/dev/null)
+ifeq ($(SYSROOT_DIR),)
+SYSROOT_DIR=$(shell readlink -f $$(LANG=C $(TARGET_CC) -print-file-name=libc.a |sed -r -e 's:usr/lib/libc\.a::;'))
+endif
+
+# Now, find if the toolchain specifies a sub-directory for the
+# specific architecture variant we're interested in. This is the case
+# with multilib toolchain, when the selected architecture variant is
+# not the default one. To do so, we ask the compiler by passing the
+# appropriate -march= flags. ARCH_SUBDIR will contain the
+# subdirectory, in the main SYSROOT_DIR, that corresponds to the
+# selected architecture variant. ARCH_SYSROOT_DIR will contain the
+# full path to this location.
+ifneq ($(CC_TARGET_ARCH_),)
+TARGET_CC_ARCH_CFLAGS+=-march=$(CC_TARGET_ARCH_)
+endif
+ARCH_SUBDIR=$(shell $(TARGET_CC) $(TARGET_CC_ARCH_CFLAGS) -print-multi-directory)
+ARCH_SYSROOT_DIR=$(SYSROOT_DIR)/$(ARCH_SUBDIR)
+
+$(STAMP_DIR)/ext-toolchain-installed:
+ @echo "Checking external toolchain settings"
+ $(Q)$(call check_cross_compiler_exists)
+ifeq ($(strip $(SYSROOT_DIR)),)
+ @echo "External toolchain doesn't support --sysroot. Cannot use."
+ exit 1
+endif
+ifeq ($(BR2_arm),y)
+ $(Q)$(call check_arm_abi)
+endif
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+ $(Q)$(call check_cplusplus)
+endif
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
+ $(Q)$(call check_uclibc,$(SYSROOT_DIR))
+else
+ $(Q)$(call check_glibc,$(SYSROOT_DIR))
+endif
+ mkdir -p $(TARGET_DIR)/lib
+ @echo "Copy external toolchain libraries to target..."
+ $(Q)for libs in $(EXTERNAL_LIBS); do \
+ $(call copy_toolchain_lib_root,$(ARCH_SYSROOT_DIR),$$libs,$(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \
+ done
+ @echo "Copy external toolchain sysroot to staging..."
+ $(Q)$(call copy_toolchain_sysroot,$(SYSROOT_DIR),$(ARCH_SYSROOT_DIR),$(ARCH_SUBDIR))
+ @touch $@
--
1.6.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 3/5] toolchain: move makefile includes
2010-06-01 21:52 [Buildroot] [pull request] Preparatory work on toolchains Yann E. MORIN
2010-06-01 21:52 ` [Buildroot] [PATCH 1/5] toolchain: move helper functions from external toolchain Yann E. MORIN
2010-06-01 21:53 ` [Buildroot] [PATCH 2/5] toolchain: rename external toolchain dir Yann E. MORIN
@ 2010-06-01 21:53 ` Yann E. MORIN
2010-06-01 21:53 ` [Buildroot] [PATCH 4/5] toollchain: move buildroot config files Yann E. MORIN
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2010-06-01 21:53 UTC (permalink / raw)
To: buildroot
Including a bunch of Makefiles with wildcard makes it impossible
to add new toolchain backends. Avoid that by namely including
needed files.
Signed-off-by: Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
---
Makefile | 17 ++---------------
toolchain/toolchain-buildroot.mk | 15 +++++++++++++++
toolchain/toolchain-external.mk | 16 ++++++++++++++++
3 files changed, 33 insertions(+), 15 deletions(-)
create mode 100644 toolchain/toolchain-buildroot.mk
create mode 100644 toolchain/toolchain-external.mk
diff --git a/Makefile b/Makefile
index 68cfebf..035c7ec 100644
--- a/Makefile
+++ b/Makefile
@@ -291,22 +291,9 @@ include .config.cmd
# each selected package to TARGETS if that package was selected
# in the .config file.
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-# avoid pulling in external toolchain which is broken for toplvl parallel builds
-# Explicit ordering:
-include toolchain/dependencies/dependencies.mk
-include toolchain/binutils/binutils.mk
-include toolchain/ccache/ccache.mk
-include toolchain/elf2flt/elf2flt.mk
-include toolchain/gcc/gcc-uclibc-3.x.mk
-include toolchain/gcc/gcc-uclibc-4.x.mk
-include toolchain/gdb/gdb.mk
-include toolchain/kernel-headers/kernel-headers.mk
-include toolchain/mklibs/mklibs.mk
-include toolchain/sstrip/sstrip.mk
-include toolchain/uClibc/uclibc.mk
+include toolchain/toolchain-buildroot.mk
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
-include toolchain/helpers.mk
-include toolchain/*/*.mk
+include toolchain/toolchain-external.mk
endif
ifeq ($(BR2_PACKAGE_LINUX),y)
diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
new file mode 100644
index 0000000..da94b42
--- /dev/null
+++ b/toolchain/toolchain-buildroot.mk
@@ -0,0 +1,15 @@
+# Include files required for the internal toolchain backend
+
+# avoid pulling in external toolchain which is broken for toplvl parallel builds
+# Explicit ordering:
+include toolchain/dependencies/dependencies.mk
+include toolchain/binutils/binutils.mk
+include toolchain/ccache/ccache.mk
+include toolchain/elf2flt/elf2flt.mk
+include toolchain/gcc/gcc-uclibc-3.x.mk
+include toolchain/gcc/gcc-uclibc-4.x.mk
+include toolchain/gdb/gdb.mk
+include toolchain/kernel-headers/kernel-headers.mk
+include toolchain/mklibs/mklibs.mk
+include toolchain/sstrip/sstrip.mk
+include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk
new file mode 100644
index 0000000..6c00330
--- /dev/null
+++ b/toolchain/toolchain-external.mk
@@ -0,0 +1,16 @@
+# Required includes for the external toolchain backend
+
+# Explicit ordering:
+include toolchain/helpers.mk
+include toolchain/binutils/binutils.mk
+include toolchain/ccache/ccache.mk
+include toolchain/dependencies/dependencies.mk
+include toolchain/elf2flt/elf2flt.mk
+include toolchain/gcc/gcc-uclibc-3.x.mk
+include toolchain/gcc/gcc-uclibc-4.x.mk
+include toolchain/gdb/gdb.mk
+include toolchain/toolchain-external/ext-tool.mk
+include toolchain/mklibs/mklibs.mk
+include toolchain/sstrip/sstrip.mk
+include toolchain/toolchain-external/ext-tool.mk
+include toolchain/uClibc/uclibc.mk
--
1.6.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 4/5] toollchain: move buildroot config files
2010-06-01 21:52 [Buildroot] [pull request] Preparatory work on toolchains Yann E. MORIN
` (2 preceding siblings ...)
2010-06-01 21:53 ` [Buildroot] [PATCH 3/5] toolchain: move makefile includes Yann E. MORIN
@ 2010-06-01 21:53 ` Yann E. MORIN
2010-06-01 21:53 ` [Buildroot] [PATCH 5/5] toolchain: rename base target for external toolchains Yann E. MORIN
2010-06-02 21:07 ` [Buildroot] [pull request] Preparatory work on toolchains Peter Korsgaard
5 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2010-06-01 21:53 UTC (permalink / raw)
To: buildroot
Handle the internal toolchain backend mechanism the
same way we handle other backends.
Signed-off-by: Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
---
toolchain/Config.in | 12 +--
toolchain/Config.in.1 | 9 --
toolchain/Config.in.2 | 200 -----------------------------
toolchain/toolchain-buildroot/Config.in | 9 ++
toolchain/toolchain-buildroot/Config.in.2 | 37 ++++++
toolchain/toolchain-common.in | 172 +++++++++++++++++++++++++
6 files changed, 221 insertions(+), 218 deletions(-)
delete mode 100644 toolchain/Config.in.1
delete mode 100644 toolchain/Config.in.2
create mode 100644 toolchain/toolchain-buildroot/Config.in
create mode 100644 toolchain/toolchain-buildroot/Config.in.2
create mode 100644 toolchain/toolchain-common.in
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 52b9d8b..fc9a048 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -16,16 +16,10 @@ config BR2_TOOLCHAIN_EXTERNAL
endchoice
-source "toolchain/Config.in.1"
+source "toolchain/toolchain-buildroot/Config.in"
source "toolchain/toolchain-external/Config.in"
-
-# we want gdb config in the middle of both source and external
-# toolchains, but mconf won't let us source the same file twice,
-# so put it here instead
-source "toolchain/gdb/Config.in"
-comment "Common Toolchain Options"
-
-source "toolchain/Config.in.2"
+source "toolchain/toolchain-common.in"
+source "toolchain/toolchain-buildroot/Config.in.2"
source "toolchain/toolchain-external/Config.in.2"
endmenu
diff --git a/toolchain/Config.in.1 b/toolchain/Config.in.1
deleted file mode 100644
index 5c26858..0000000
--- a/toolchain/Config.in.1
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-
-if BR2_TOOLCHAIN_BUILDROOT
-source "toolchain/kernel-headers/Config.in"
-source "toolchain/uClibc/Config.in"
-source "toolchain/binutils/Config.in"
-source "toolchain/gcc/Config.in"
-source "toolchain/ccache/Config.in"
-endif
diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2
deleted file mode 100644
index 595ab87..0000000
--- a/toolchain/Config.in.2
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-config BR2_LARGEFILE
- bool "Enable large file (files > 2 GB) support?"
- depends on !BR2_cris
- help
- If you are building your own toolchain and you want to
- support files larger than 2GB then enable this option.
- If you have an external binary toolchain that has been
- built with large file support (files > 2GB) then enable
- this option.
-
-config BR2_INET_IPV6
- bool "Enable IPv6"
- help
- If you are building your own toolchain and you want to
- enable IPV6 support then enable this option.
- If you have an external binary toolchain that has been
- built with IPV6 support then enable this option.
-
-config BR2_INET_RPC
- bool "Enable RPC"
- help
- Enable RPC. RPC support is needed for nfs.
- If you are building your own toolchain and you want to
- enable RPC support then enable this option.
- If you have an external binary toolchain that has been
- built with RPC support then enable this option.
-
-config BR2_ENABLE_LOCALE
- bool "Enable toolchain locale/i18n support?"
- select BR2_USE_WCHAR
- help
- If you are building your own toolchain and you want to
- enable locale/i18n support then enable this option.
- If you have an external binary toolchain that has been
- built with locale/i18n support then enable this option.
-
-config BR2_ENABLE_LOCALE_PURGE
- bool "Purge unwanted locales"
- help
- Explicitly specify what locales to install on target. If N
- then all locales supported by packages are installed.
-
-config BR2_ENABLE_LOCALE_WHITELIST
- string "Locales to keep"
- default "C en_US de fr"
- depends on BR2_ENABLE_LOCALE_PURGE
- help
- Whitespace seperated list of locales to allow on target.
- Locales not listed here will be removed from the target.
- See 'locale -a' on your host for a list of locales available
- on your build host, or have a look in /usr/share/locale in
- the target file system for available locales.
-
- Notice that listing a locale here doesn't guarantee that it
- will be available on the target - That purely depends on the
- support for that locale in the selected packages.
-
-# glibc and eglibc directly include gettext, so a separatly compiled
-# gettext isn't needed and shouldn't be built to avoid conflicts. Some
-# packages always need gettext, other packages only need gettext when
-# locale support is enabled. See the documentation for how packages
-# should rely on the following two options.
-
-config BR2_NEEDS_GETTEXT
- bool
- default y if BR2_TOOLCHAIN_BUILDROOT
- default y if BR2_TOOLCHAIN_EXTERNAL_UCLIBC
-
-config BR2_NEEDS_GETTEXT_IF_LOCALE
- bool
- default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE)
-
-config BR2_USE_WCHAR
- bool "Enable WCHAR support"
- help
- If you are building your own toolchain and you want to
- enable WCHAR support then enable this option.
- If you have an external binary toolchain that has been built
- with WCHAR support then enable this option.
-
-config BR2_PREFER_SOFT_FLOAT
- bool
- default y if BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel
-
-config BR2_SOFT_FLOAT
- bool "Use software floating point by default"
- depends on BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel || BR2_powerpc
- default $(BR2_PREFER_SOFT_FLOAT)
- help
- If your target CPU does not have a Floating Point Unit (FPU) or a
- kernel FPU emulator, but you still wish to support floating point
- functions, then everything will need to be compiled with soft
- floating point support (-msoft-float).
-
-config BR2_USE_SSP
- bool "Enable stack protection support"
- help
- Enable stack smashing protection support using GCCs
- -fstack-protector[-all] option.
-
- See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
- for details.
-
-choice
- prompt "Thread library implementation"
- default BR2_PTHREADS_OLD
- help
- If you are building your own toolchain then select the type of
- libpthreads you want to use.
- Not all thread variants work with all versions of uClibc,
- the "linuxthreads (stable/old)" may be a working fallback
- if you need threading at all.
- If you have an external binary toolchain then select the type
- of libpthreads it was built with.
-
- config BR2_PTHREADS_NONE
- bool "none"
-
- config BR2_PTHREADS
- bool "linuxthreads"
-
- config BR2_PTHREADS_OLD
- bool "linuxthreads (stable/old)"
-
- config BR2_PTHREADS_NATIVE
- bool "Native POSIX Threading (NPTL)"
- depends on BR2_UCLIBC_VERSION_SNAPSHOT
-endchoice
-
-config BR2_PROGRAM_INVOCATION
- bool "Enable 'program invocation name'"
- help
- Support for the GNU-specific program_invocation_name and
- program_invocation_short_name strings. Some GNU packages
- (like tar and coreutils) utilize these for extra useful
- output, but in general are not required.
- If you have an external binary toolchain that has been built
- with program invocation support then enable this option.
-
-config BR2_GCC_CROSS_CXX
- bool
- help
- If you are building your own toolchain and want to build
- a C++ cross-compiler this needs to be enabled.
- If you have an external binary toolchain that has a C++ compiler
- and you want to use it then you need to enable this option.
-
-config BR2_INSTALL_LIBSTDCPP
- bool "Build/install c++ compiler and libstdc++?"
- select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_BUILDROOT)
- select BR2_GCC_CROSS_CXX
- help
- If you are building your own toolchain and want to build and install
- the C++ compiler and library then you need to enable this option.
- If you have an external toolchain that has been built with C++
- support and you want to use the compiler / library then you need
- to select this option.
-
-config BR2_TARGET_OPTIMIZATION
- string "Target Optimizations"
- default "-Os -pipe"
- help
- Optimizations to use when building for the target host.
-
-if BR2_TOOLCHAIN_BUILDROOT
-source "toolchain/elf2flt/Config.in"
-source "toolchain/mklibs/Config.in"
-source "toolchain/sstrip/Config.in"
-
-config BR2_ENABLE_MULTILIB
- bool "Enable multilib support?"
- help
- Build libraries to support different ABIs.
-
-config BR2_VFP_FLOAT
- bool "Use ARM Vector Floating Point unit"
- depends on !BR2_SOFT_FLOAT
- depends on BR2_arm || BR2_armeb
- help
- Setting this option will enable the "-mfpu=vfp" option.
- If your ARM CPU has a Vector Floating Point Unit (VFP)
- and the toolchain supports the option, then the
- code can be optimized.
-
- Most people will answer N.
-
-config BR2_CROSS_TOOLCHAIN_TARGET_UTILS
- bool "Include target utils in cross toolchain"
- default y
- help
- When using buildroot to build a deployable cross toolchain,
- it is handy to include certain target apps with that toolchain
- as a convenience.
- Examples include ldd, gdbserver, and strace.
-
- Answer Y if you want these apps (if built) copied into the
- cross toolchain dir under <arch>-linux-uclibc/target_utils/.
-
-endif
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
new file mode 100644
index 0000000..a9dd192
--- /dev/null
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -0,0 +1,9 @@
+# Config entries for internal toolchain backend
+
+if BR2_TOOLCHAIN_BUILDROOT
+source "toolchain/kernel-headers/Config.in"
+source "toolchain/uClibc/Config.in"
+source "toolchain/binutils/Config.in"
+source "toolchain/gcc/Config.in"
+source "toolchain/ccache/Config.in"
+endif
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
new file mode 100644
index 0000000..512a608
--- /dev/null
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -0,0 +1,37 @@
+# Buildroot backend specific options
+
+if BR2_TOOLCHAIN_BUILDROOT
+source "toolchain/elf2flt/Config.in"
+source "toolchain/mklibs/Config.in"
+source "toolchain/sstrip/Config.in"
+
+config BR2_ENABLE_MULTILIB
+ bool "Enable multilib support?"
+ help
+ Build libraries to support different ABIs.
+
+config BR2_VFP_FLOAT
+ bool "Use ARM Vector Floating Point unit"
+ depends on !BR2_SOFT_FLOAT
+ depends on BR2_arm || BR2_armeb
+ help
+ Setting this option will enable the "-mfpu=vfp" option.
+ If your ARM CPU has a Vector Floating Point Unit (VFP)
+ and the toolchain supports the option, then the
+ code can be optimized.
+
+ Most people will answer N.
+
+config BR2_CROSS_TOOLCHAIN_TARGET_UTILS
+ bool "Include target utils in cross toolchain"
+ default y
+ help
+ When using buildroot to build a deployable cross toolchain,
+ it is handy to include certain target apps with that toolchain
+ as a convenience.
+ Examples include ldd, gdbserver, and strace.
+
+ Answer Y if you want these apps (if built) copied into the
+ cross toolchain dir under <arch>-linux-uclibc/target_utils/.
+
+endif
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
new file mode 100644
index 0000000..152d009
--- /dev/null
+++ b/toolchain/toolchain-common.in
@@ -0,0 +1,172 @@
+# Generic toolchain options
+
+# we want gdb config in the middle of both source and external
+# toolchains, but mconf won't let us source the same file twice,
+# so put it here instead
+source "toolchain/gdb/Config.in"
+
+comment "Common Toolchain Options"
+
+config BR2_LARGEFILE
+ bool "Enable large file (files > 2 GB) support?"
+ depends on !BR2_cris
+ help
+ If you are building your own toolchain and you want to
+ support files larger than 2GB then enable this option.
+ If you have an external binary toolchain that has been
+ built with large file support (files > 2GB) then enable
+ this option.
+
+config BR2_INET_IPV6
+ bool "Enable IPv6"
+ help
+ If you are building your own toolchain and you want to
+ enable IPV6 support then enable this option.
+ If you have an external binary toolchain that has been
+ built with IPV6 support then enable this option.
+
+config BR2_INET_RPC
+ bool "Enable RPC"
+ help
+ Enable RPC. RPC support is needed for nfs.
+ If you are building your own toolchain and you want to
+ enable RPC support then enable this option.
+ If you have an external binary toolchain that has been
+ built with RPC support then enable this option.
+
+config BR2_ENABLE_LOCALE
+ bool "Enable toolchain locale/i18n support?"
+ select BR2_USE_WCHAR
+ help
+ If you are building your own toolchain and you want to
+ enable locale/i18n support then enable this option.
+ If you have an external binary toolchain that has been
+ built with locale/i18n support then enable this option.
+
+config BR2_ENABLE_LOCALE_PURGE
+ bool "Purge unwanted locales"
+ help
+ Explicitly specify what locales to install on target. If N
+ then all locales supported by packages are installed.
+
+config BR2_ENABLE_LOCALE_WHITELIST
+ string "Locales to keep"
+ default "C en_US de fr"
+ depends on BR2_ENABLE_LOCALE_PURGE
+ help
+ Whitespace seperated list of locales to allow on target.
+ Locales not listed here will be removed from the target.
+ See 'locale -a' on your host for a list of locales available
+ on your build host, or have a look in /usr/share/locale in
+ the target file system for available locales.
+
+ Notice that listing a locale here doesn't guarantee that it
+ will be available on the target - That purely depends on the
+ support for that locale in the selected packages.
+
+# glibc and eglibc directly include gettext, so a separatly compiled
+# gettext isn't needed and shouldn't be built to avoid conflicts. Some
+# packages always need gettext, other packages only need gettext when
+# locale support is enabled. See the documentation for how packages
+# should rely on the following two options.
+
+config BR2_NEEDS_GETTEXT
+ bool
+ default y if BR2_TOOLCHAIN_BUILDROOT
+ default y if BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+
+config BR2_NEEDS_GETTEXT_IF_LOCALE
+ bool
+ default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE)
+
+config BR2_USE_WCHAR
+ bool "Enable WCHAR support"
+ help
+ If you are building your own toolchain and you want to
+ enable WCHAR support then enable this option.
+ If you have an external binary toolchain that has been built
+ with WCHAR support then enable this option.
+
+config BR2_PREFER_SOFT_FLOAT
+ bool
+ default y if BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel
+
+config BR2_SOFT_FLOAT
+ bool "Use software floating point by default"
+ depends on BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel || BR2_powerpc
+ default $(BR2_PREFER_SOFT_FLOAT)
+ help
+ If your target CPU does not have a Floating Point Unit (FPU) or a
+ kernel FPU emulator, but you still wish to support floating point
+ functions, then everything will need to be compiled with soft
+ floating point support (-msoft-float).
+
+config BR2_USE_SSP
+ bool "Enable stack protection support"
+ help
+ Enable stack smashing protection support using GCCs
+ -fstack-protector[-all] option.
+
+ See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
+ for details.
+
+choice
+ prompt "Thread library implementation"
+ default BR2_PTHREADS_OLD
+ help
+ If you are building your own toolchain then select the type of
+ libpthreads you want to use.
+ Not all thread variants work with all versions of uClibc,
+ the "linuxthreads (stable/old)" may be a working fallback
+ if you need threading at all.
+ If you have an external binary toolchain then select the type
+ of libpthreads it was built with.
+
+ config BR2_PTHREADS_NONE
+ bool "none"
+
+ config BR2_PTHREADS
+ bool "linuxthreads"
+
+ config BR2_PTHREADS_OLD
+ bool "linuxthreads (stable/old)"
+
+ config BR2_PTHREADS_NATIVE
+ bool "Native POSIX Threading (NPTL)"
+ depends on BR2_UCLIBC_VERSION_SNAPSHOT
+endchoice
+
+config BR2_PROGRAM_INVOCATION
+ bool "Enable 'program invocation name'"
+ help
+ Support for the GNU-specific program_invocation_name and
+ program_invocation_short_name strings. Some GNU packages
+ (like tar and coreutils) utilize these for extra useful
+ output, but in general are not required.
+ If you have an external binary toolchain that has been built
+ with program invocation support then enable this option.
+
+config BR2_GCC_CROSS_CXX
+ bool
+ help
+ If you are building your own toolchain and want to build
+ a C++ cross-compiler this needs to be enabled.
+ If you have an external binary toolchain that has a C++ compiler
+ and you want to use it then you need to enable this option.
+
+config BR2_INSTALL_LIBSTDCPP
+ bool "Build/install c++ compiler and libstdc++?"
+ select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_BUILDROOT)
+ select BR2_GCC_CROSS_CXX
+ help
+ If you are building your own toolchain and want to build and install
+ the C++ compiler and library then you need to enable this option.
+ If you have an external toolchain that has been built with C++
+ support and you want to use the compiler / library then you need
+ to select this option.
+
+config BR2_TARGET_OPTIMIZATION
+ string "Target Optimizations"
+ default "-Os -pipe"
+ help
+ Optimizations to use when building for the target host.
--
1.6.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 5/5] toolchain: rename base target for external toolchains
2010-06-01 21:52 [Buildroot] [pull request] Preparatory work on toolchains Yann E. MORIN
` (3 preceding siblings ...)
2010-06-01 21:53 ` [Buildroot] [PATCH 4/5] toollchain: move buildroot config files Yann E. MORIN
@ 2010-06-01 21:53 ` Yann E. MORIN
2010-06-02 21:07 ` [Buildroot] [pull request] Preparatory work on toolchains Peter Korsgaard
5 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2010-06-01 21:53 UTC (permalink / raw)
To: buildroot
It is misleeading to name the external toolchain make target 'uclibc', as
external toochains can be based on other C libraries (eg. glibc or eglibc).
Signed-off-by: Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
---
Makefile | 2 +-
toolchain/toolchain-external/ext-tool.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 035c7ec..6e59a30 100644
--- a/Makefile
+++ b/Makefile
@@ -202,7 +202,7 @@ PREFERRED_LIB_FLAGS:=--enable-static --enable-shared
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
-BASE_TARGETS:=uclibc
+BASE_TARGETS:=toolchain-prepare
endif
TARGETS:=
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index c8e7892..d6a759c 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -35,7 +35,7 @@
# cross-compiler binaries remains external, all libraries and headers
# are imported into the Buildroot tree.
-uclibc: dependencies $(STAMP_DIR)/ext-toolchain-installed
+toolchain-prepare: dependencies $(STAMP_DIR)/ext-toolchain-installed
EXTERNAL_LIBS=libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
--
1.6.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [pull request] Preparatory work on toolchains
2010-06-01 21:52 [Buildroot] [pull request] Preparatory work on toolchains Yann E. MORIN
` (4 preceding siblings ...)
2010-06-01 21:53 ` [Buildroot] [PATCH 5/5] toolchain: rename base target for external toolchains Yann E. MORIN
@ 2010-06-02 21:07 ` Peter Korsgaard
2010-06-08 17:14 ` Yann E. MORIN
5 siblings, 1 reply; 8+ messages in thread
From: Peter Korsgaard @ 2010-06-02 21:07 UTC (permalink / raw)
To: buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@anciens.enib.fr> writes:
Yann> The following changes since commit 4a640e464439a5e78458ae969dcc6017aa96278f:
Yann> Peter Korsgaard (1):
Yann> docs/news.html: add 2010.05 announcement
Yann> are available in the git repository at:
Yann> git://git.busybox.net/~ymorin/git/buildroot master
Yann> These are preparatory work on toolchain, laying ground to later add
Yann> crosstool-NG as a backend. Currently, these are rather an RFC, even
Yann> if it works OK for me.
Yann> Yann E. MORIN (5):
Yann> toolchain: move helper functions from external toolchain
Yann> toolchain: rename external toolchain dir
Yann> toolchain: move makefile includes
Yann> toollchain: move buildroot config files
Yann> toolchain: rename base target for external toolchains
Thanks. With all those renames the patches gets a lot easier to review
if you create them with -M (detect renames). Could you resend, please?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] [pull request] Preparatory work on toolchains
2010-06-02 21:07 ` [Buildroot] [pull request] Preparatory work on toolchains Peter Korsgaard
@ 2010-06-08 17:14 ` Yann E. MORIN
0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2010-06-08 17:14 UTC (permalink / raw)
To: buildroot
Peter, All,
On Wednesday 02 June 2010 23:07:52 Peter Korsgaard wrote:
> >>>>> "Yann" == Yann E MORIN <yann.morin.1998@anciens.enib.fr> writes:
> Yann> The following changes since commit 4a640e464439a5e78458ae969dcc6017aa96278f:
> Yann> Peter Korsgaard (1):
> Yann> docs/news.html: add 2010.05 announcement
[--SNIP--]
> Thanks. With all those renames the patches gets a lot easier to review
> if you create them with -M (detect renames). Could you resend, please?
Sorry for the delay, I have been pretty busy IRL lately...
I will rework the series this week.
However, can't you get and inspect the patches using the git tree I have
pushed them into? It has been previously suggested that using the git tree
would be easier to review the patchset, and the reason I asked for it in
the first place.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread