Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -13,10 +13,9 @@
|
||||
# * Toolchains provided by Linaro for the ARM and AArch64
|
||||
# architectures
|
||||
# * Sourcery CodeBench toolchains (from Mentor Graphics) for the ARM,
|
||||
# MIPS, PowerPC, x86, x86_64 and NIOS 2 architectures. For the MIPS
|
||||
# MIPS, PowerPC, x86_64 and NIOS 2 architectures. For the MIPS
|
||||
# toolchain, the -muclibc variant isn't supported yet, only the
|
||||
# default glibc-based variant is.
|
||||
# * Xilinx toolchains for the Microblaze architecture
|
||||
# * Synopsys DesignWare toolchains for ARC cores
|
||||
#
|
||||
# The basic principle is the following
|
||||
@@ -55,7 +54,7 @@
|
||||
# so we're sure the correct configuration is always used and the
|
||||
# toolchain behaves similar to an internal toolchain.
|
||||
# This toolchain wrapper and symlinks are installed into
|
||||
# $(HOST_DIR)/usr/bin like for the internal toolchains, and the rest
|
||||
# $(HOST_DIR)/bin like for the internal toolchains, and the rest
|
||||
# of Buildroot is handled identical for the 2 toolchain types.
|
||||
################################################################################
|
||||
|
||||
@@ -75,10 +74,10 @@ endif
|
||||
ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
|
||||
ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
|
||||
# if no path set, figure it out from path
|
||||
TOOLCHAIN_EXTERNAL_BIN := $(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
|
||||
TOOLCHAIN_EXTERNAL_BIN := $(dir $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
|
||||
endif
|
||||
else
|
||||
TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin
|
||||
TOOLCHAIN_EXTERNAL_BIN = $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin
|
||||
endif
|
||||
|
||||
# If this is a buildroot toolchain, it already has a wrapper which we want to
|
||||
@@ -91,7 +90,7 @@ TOOLCHAIN_EXTERNAL_CROSS = $(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX
|
||||
TOOLCHAIN_EXTERNAL_CC = $(TOOLCHAIN_EXTERNAL_CROSS)gcc$(TOOLCHAIN_EXTERNAL_SUFFIX)
|
||||
TOOLCHAIN_EXTERNAL_CXX = $(TOOLCHAIN_EXTERNAL_CROSS)g++$(TOOLCHAIN_EXTERNAL_SUFFIX)
|
||||
TOOLCHAIN_EXTERNAL_FC = $(TOOLCHAIN_EXTERNAL_CROSS)gfortran$(TOOLCHAIN_EXTERNAL_SUFFIX)
|
||||
TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf$(TOOLCHAIN_EXTERNAL_SUFFIX)
|
||||
TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf
|
||||
|
||||
# Normal handling of downloaded toolchain tarball extraction.
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
|
||||
@@ -108,13 +107,11 @@ endif
|
||||
#
|
||||
# Definitions of the list of libraries that should be copied to the target.
|
||||
#
|
||||
|
||||
TOOLCHAIN_EXTERNAL_LIBS += ld*.so* libgcc_s.so.* libatomic.so.*
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libatomic.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += ld-linux-armhf.so.*
|
||||
else
|
||||
TOOLCHAIN_EXTERNAL_LIBS += ld*.so.*
|
||||
endif
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libc.so.* libcrypt.so.* libdl.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libpthread.so.*
|
||||
ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
|
||||
@@ -128,7 +125,7 @@ TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* libanl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libc.so libgcc_s.so.*
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libc.so
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||
@@ -157,6 +154,8 @@ CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVIS
|
||||
endif
|
||||
CC_TARGET_ARCH_ := $(call qstrip,$(BR2_GCC_TARGET_ARCH))
|
||||
CC_TARGET_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_ABI))
|
||||
CC_TARGET_NAN_ := $(call qstrip,$(BR2_GCC_TARGET_NAN))
|
||||
CC_TARGET_FP32_MODE_ := $(call qstrip,$(BR2_GCC_TARGET_FP32_MODE))
|
||||
CC_TARGET_FPU_ := $(call qstrip,$(BR2_GCC_TARGET_FPU))
|
||||
CC_TARGET_FLOAT_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
|
||||
CC_TARGET_MODE_ := $(call qstrip,$(BR2_GCC_TARGET_MODE))
|
||||
@@ -179,6 +178,16 @@ ifneq ($(CC_TARGET_ABI_),)
|
||||
TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_)
|
||||
TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"'
|
||||
endif
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_MNAN_OPTION),y)
|
||||
ifneq ($(CC_TARGET_NAN_),)
|
||||
TOOLCHAIN_EXTERNAL_CFLAGS += -mnan=$(CC_TARGET_NAN_)
|
||||
TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_NAN='"$(CC_TARGET_NAN_)"'
|
||||
endif
|
||||
endif
|
||||
ifneq ($(CC_TARGET_FP32_MODE_),)
|
||||
TOOLCHAIN_EXTERNAL_CFLAGS += -mfp$(CC_TARGET_FP32_MODE_)
|
||||
TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_FP32_MODE='"$(CC_TARGET_FP32_MODE_)"'
|
||||
endif
|
||||
ifneq ($(CC_TARGET_FPU_),)
|
||||
TOOLCHAIN_EXTERNAL_CFLAGS += -mfpu=$(CC_TARGET_FPU_)
|
||||
TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_FPU='"$(CC_TARGET_FPU_)"'
|
||||
@@ -231,13 +240,13 @@ endif
|
||||
|
||||
#
|
||||
# The following functions creates the symbolic links needed to get the
|
||||
# cross-compilation tools visible in $(HOST_DIR)/usr/bin. Some of
|
||||
# cross-compilation tools visible in $(HOST_DIR)/bin. Some of
|
||||
# links are done directly to the corresponding tool in the external
|
||||
# toolchain installation directory, while some other links are done to
|
||||
# the toolchain wrapper (preprocessor, C, C++ and Fortran compiler)
|
||||
#
|
||||
# We skip gdb symlink when we are building our own gdb to prevent two
|
||||
# gdb's in $(HOST_DIR)/usr/bin.
|
||||
# gdb's in $(HOST_DIR)/bin.
|
||||
#
|
||||
# The LTO support in gcc creates wrappers for ar, ranlib and nm which load
|
||||
# the lto plugin. These wrappers are called *-gcc-ar, *-gcc-ranlib, and
|
||||
@@ -246,23 +255,23 @@ endif
|
||||
# match the *cc-* pattern. Therefore, an additional case is added for *-ar,
|
||||
# *-ranlib and *-nm.
|
||||
define TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER
|
||||
$(Q)cd $(HOST_DIR)/usr/bin; \
|
||||
$(Q)cd $(HOST_DIR)/bin; \
|
||||
for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \
|
||||
base=$${i##*/}; \
|
||||
case "$$base" in \
|
||||
*-ar|*-ranlib|*-nm) \
|
||||
ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \
|
||||
ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%..%') .; \
|
||||
;; \
|
||||
*cc|*cc-*|*++|*++-*|*cpp|*-gfortran) \
|
||||
ln -sf toolchain-wrapper $$base; \
|
||||
;; \
|
||||
*gdb|*gdbtui) \
|
||||
if test "$(BR2_PACKAGE_HOST_GDB)" != "y"; then \
|
||||
ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \
|
||||
ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%..%') .; \
|
||||
fi \
|
||||
;; \
|
||||
*) \
|
||||
ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \
|
||||
ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%..%') .; \
|
||||
;; \
|
||||
esac; \
|
||||
done
|
||||
@@ -332,7 +341,7 @@ endef
|
||||
# Returns the lib subdirectory for the given compiler + flags (i.e
|
||||
# typically lib32 or lib64 for some toolchains)
|
||||
define toolchain_find_libdir
|
||||
$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?([^/]*)?)/([^/]*/)?libc.a:\2:')
|
||||
$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?([^/]*)?(/[^/]*)?)/libc.a:\2:')
|
||||
endef
|
||||
|
||||
# Returns the location of the libc.a file for the given compiler + flags
|
||||
@@ -387,8 +396,8 @@ endef
|
||||
ifeq ($(BR2_STATIC_LIBS),)
|
||||
define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
|
||||
$(Q)$(call MESSAGE,"Copying external toolchain libraries to target...")
|
||||
$(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \
|
||||
$(call copy_toolchain_lib_root,$$libs); \
|
||||
$(Q)for libpattern in $(TOOLCHAIN_EXTERNAL_LIBS); do \
|
||||
$(call copy_toolchain_lib_root,$$libpattern); \
|
||||
done
|
||||
endef
|
||||
endif
|
||||
@@ -445,19 +454,20 @@ endef
|
||||
#
|
||||
# $1: destination directory (TARGET_DIR / STAGING_DIR)
|
||||
create_lib_symlinks = \
|
||||
$(Q)DESTDIR="$(strip $1)" ; \
|
||||
ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
|
||||
if [ ! -e "$${DESTDIR}/$${ARCH_LIB_DIR}" -a ! -e "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ]; then \
|
||||
ln -snf lib "$${DESTDIR}/$${ARCH_LIB_DIR}" ; \
|
||||
ln -snf lib "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ; \
|
||||
fi
|
||||
$(Q)DESTDIR="$(strip $1)" ; \
|
||||
ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
|
||||
if [ ! -e "$${DESTDIR}/$${ARCH_LIB_DIR}" -a ! -e "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ]; then \
|
||||
relpath="$(call relpath_prefix,$${ARCH_LIB_DIR})" ; \
|
||||
ln -snf $${relpath}lib "$${DESTDIR}/$${ARCH_LIB_DIR}" ; \
|
||||
ln -snf $${relpath}lib "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ; \
|
||||
fi
|
||||
|
||||
define TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK
|
||||
$(call create_lib_symlinks,$(STAGING_DIR))
|
||||
$(call create_lib_symlinks,$(STAGING_DIR))
|
||||
endef
|
||||
|
||||
define TOOLCHAIN_EXTERNAL_CREATE_TARGET_LIB_SYMLINK
|
||||
$(call create_lib_symlinks,$(TARGET_DIR))
|
||||
$(call create_lib_symlinks,$(TARGET_DIR))
|
||||
endef
|
||||
|
||||
#
|
||||
@@ -470,30 +480,6 @@ define TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT
|
||||
fi
|
||||
endef
|
||||
|
||||
# Various utility functions used by the external toolchain based on musl.
|
||||
|
||||
# With the musl C library, the libc.so library directly plays the role
|
||||
# of the dynamic library loader. We just need to create a symbolic
|
||||
# link to libc.so with the appropriate name.
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL):$(BR2_STATIC_LIBS),y:)
|
||||
ifeq ($(BR2_i386),y)
|
||||
MUSL_ARCH = i386
|
||||
else ifeq ($(BR2_ARM_EABIHF),y)
|
||||
MUSL_ARCH = armhf
|
||||
else ifeq ($(BR2_mips):$(BR2_SOFT_FLOAT),y:y)
|
||||
MUSL_ARCH = mips-sf
|
||||
else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:y)
|
||||
MUSL_ARCH = mipsel-sf
|
||||
else ifeq ($(BR2_sh),y)
|
||||
MUSL_ARCH = sh
|
||||
else
|
||||
MUSL_ARCH = $(ARCH)
|
||||
endif
|
||||
define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK
|
||||
ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1
|
||||
endef
|
||||
endif
|
||||
|
||||
# uClibc-ng dynamic loader is called ld-uClibc.so.1, but gcc is not
|
||||
# patched specifically for uClibc-ng, so it continues to generate
|
||||
# binaries that expect the dynamic loader to be named ld-uClibc.so.0,
|
||||
@@ -555,8 +541,7 @@ define $(2)_CONFIGURE_CMDS
|
||||
$$(call qstrip,$$(BR2_TOOLCHAIN_GCC_AT_LEAST))); \
|
||||
if test "$$(BR2_arm)" = "y" ; then \
|
||||
$$(call check_arm_abi,\
|
||||
"$$(TOOLCHAIN_EXTERNAL_CC) $$(TOOLCHAIN_EXTERNAL_CFLAGS)",\
|
||||
$$(TOOLCHAIN_EXTERNAL_READELF)) ; \
|
||||
"$$(TOOLCHAIN_EXTERNAL_CC) $$(TOOLCHAIN_EXTERNAL_CFLAGS)") ; \
|
||||
fi ; \
|
||||
if test "$$(BR2_INSTALL_LIBSTDCPP)" = "y" ; then \
|
||||
$$(call check_cplusplus,$$(TOOLCHAIN_EXTERNAL_CXX)) ; \
|
||||
@@ -567,7 +552,9 @@ define $(2)_CONFIGURE_CMDS
|
||||
if test "$$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)" = "y" ; then \
|
||||
$$(call check_uclibc,$$$${SYSROOT_DIR}) ; \
|
||||
elif test "$$(BR2_TOOLCHAIN_EXTERNAL_MUSL)" = "y" ; then \
|
||||
$$(call check_musl,$$$${SYSROOT_DIR}) ; \
|
||||
$$(call check_musl,\
|
||||
"$$(TOOLCHAIN_EXTERNAL_CC) $$(TOOLCHAIN_EXTERNAL_CFLAGS)",\
|
||||
$$(TOOLCHAIN_EXTERNAL_READELF)) ; \
|
||||
else \
|
||||
$$(call check_glibc,$$$${SYSROOT_DIR}) ; \
|
||||
fi
|
||||
@@ -586,10 +573,6 @@ define $(2)_INSTALL_STAGING_CMDS
|
||||
$$(TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT)
|
||||
endef
|
||||
|
||||
ifeq ($$(BR2_TOOLCHAIN_EXTERNAL_MUSL),y)
|
||||
$(2)_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK
|
||||
endif
|
||||
|
||||
# Even though we're installing things in both the staging, the host
|
||||
# and the target directory, we do everything within the
|
||||
# install-staging step, arbitrarily.
|
||||
|
||||
Reference in New Issue
Block a user