Disable multilib and down GCC to 6.5.0

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc 2022-04-22 20:20:34 +02:00
parent 36a63a7ac3
commit ebb53b4be1
4 changed files with 27 additions and 43 deletions

View File

@ -95,7 +95,7 @@ The dockcross script will execute the given command-line inside the container, a
| dockcross/linux-armv7a | ARMv7a | GCC | Linux | | dockcross/linux-armv7a | ARMv7a | GCC | Linux |
| dockcross/linux-armv7l-musl | ARMv7l | GCC + musl | Linux | | dockcross/linux-armv7l-musl | ARMv7l | GCC + musl | Linux |
| dockcross/linux-mips | mips | GCC | Linux | | dockcross/linux-mips | mips | GCC | Linux |
| dockcross/linux-mipsel-lts | mipsel | GCC 8.5.0 + Glibc 2.24 (multilib) | Linux | | dockcross/linux-mipsel-lts | mipsel | GCC 6.5.0 + Glibc 2.24 | Linux |
| dockcross/linux-s390x | s390x | GCC | Linux | | dockcross/linux-s390x | s390x | GCC | Linux |
| dockcross/linux-ppc64le | ppc64le | GCC | Linux | | dockcross/linux-ppc64le | ppc64le | GCC | Linux |
| dockcross/linux-riscv32 | riscv32 | GCC | Linux | | dockcross/linux-riscv32 | riscv32 | GCC | Linux |
@ -272,7 +272,7 @@ MIPS GNU systems.
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-mipsel-ltslatest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-mipsel-lts) ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-mipsel-ltslatest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-mipsel-lts)
Linux mips cross compiler toolchain for little endian 32-bit or 64bit (multilib) soft float Linux mips cross compiler toolchain for little endian 32-bit soft float
MIPS GNU systems. MIPS GNU systems.
### dockcross/linux-s390x ### dockcross/linux-s390x

View File

@ -18,8 +18,8 @@ RUN apt-get update \
&& apt-get clean --yes && apt-get clean --yes
# The CROSS_TRIPLE is a configured alias of the "mipsel-multilib-linux-gnu" target. # The CROSS_TRIPLE is a configured alias of the "mipsel-unknown-linux-gnu" target.
ENV CROSS_TRIPLE mipsel-multilib-linux-gnu ENV CROSS_TRIPLE mipsel-unknown-linux-gnu
ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE} ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
@ -35,7 +35,7 @@ ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
ENV PKG_CONFIG_PATH /usr/lib/mipsel-multilib-linux-gnu/ ENV PKG_CONFIG_PATH /usr/lib/mipsel-unknown-linux-gnu/
# Linux kernel cross compilation variables # Linux kernel cross compilation variables
ENV PATH ${PATH}:${CROSS_ROOT}/bin ENV PATH ${PATH}:${CROSS_ROOT}/bin

View File

@ -17,5 +17,5 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot) set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)
set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm) set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-mipsel)

View File

@ -160,7 +160,8 @@ CT_ARCH_SUFFIX=""
# #
# Generic target options # Generic target options
# #
CT_MULTILIB=y # CT_MULTILIB is not set
CT_DEMULTILIB=y
CT_ARCH_USE_MMU=y CT_ARCH_USE_MMU=y
CT_ARCH_SUPPORTS_EITHER_ENDIAN=y CT_ARCH_SUPPORTS_EITHER_ENDIAN=y
CT_ARCH_DEFAULT_BE=y CT_ARCH_DEFAULT_BE=y
@ -210,7 +211,7 @@ CT_TOOLCHAIN_BUGURL=""
# #
# Tuple completion and aliasing # Tuple completion and aliasing
# #
CT_TARGET_VENDOR="multilib" CT_TARGET_VENDOR="unknown"
CT_TARGET_ALIAS_SED_EXPR="" CT_TARGET_ALIAS_SED_EXPR=""
CT_TARGET_ALIAS="" CT_TARGET_ALIAS=""
@ -266,13 +267,13 @@ CT_LINUX_PATCH_ORDER="global"
# CT_LINUX_V_5_9 is not set # CT_LINUX_V_5_9 is not set
# CT_LINUX_V_5_8 is not set # CT_LINUX_V_5_8 is not set
# CT_LINUX_V_5_7 is not set # CT_LINUX_V_5_7 is not set
CT_LINUX_V_5_4=y # CT_LINUX_V_5_4 is not set
# CT_LINUX_V_5_3 is not set # CT_LINUX_V_5_3 is not set
# CT_LINUX_V_5_2 is not set # CT_LINUX_V_5_2 is not set
# CT_LINUX_V_5_1 is not set # CT_LINUX_V_5_1 is not set
# CT_LINUX_V_5_0 is not set # CT_LINUX_V_5_0 is not set
# CT_LINUX_V_4_20 is not set # CT_LINUX_V_4_20 is not set
# CT_LINUX_V_4_19 is not set CT_LINUX_V_4_19=y
# CT_LINUX_V_4_18 is not set # CT_LINUX_V_4_18 is not set
# CT_LINUX_V_4_17 is not set # CT_LINUX_V_4_17 is not set
# CT_LINUX_V_4_16 is not set # CT_LINUX_V_4_16 is not set
@ -291,7 +292,7 @@ CT_LINUX_V_5_4=y
# CT_LINUX_V_3_10 is not set # CT_LINUX_V_3_10 is not set
# CT_LINUX_V_3_4 is not set # CT_LINUX_V_3_4 is not set
# CT_LINUX_V_3_2 is not set # CT_LINUX_V_3_2 is not set
CT_LINUX_VERSION="5.4.179" CT_LINUX_VERSION="4.19.229"
CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})" CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -299,8 +300,8 @@ CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign" CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign"
CT_LINUX_5_12_or_older=y CT_LINUX_5_12_or_older=y
CT_LINUX_older_than_5_12=y CT_LINUX_older_than_5_12=y
CT_LINUX_later_than_5_3=y CT_LINUX_5_3_or_older=y
CT_LINUX_5_3_or_later=y CT_LINUX_older_than_5_3=y
CT_LINUX_later_than_4_8=y CT_LINUX_later_than_4_8=y
CT_LINUX_4_8_or_later=y CT_LINUX_4_8_or_later=y
CT_LINUX_later_than_3_7=y CT_LINUX_later_than_3_7=y
@ -471,8 +472,8 @@ CT_GLIBC_FORCE_UNWIND=y
# CT_GLIBC_KERNEL_VERSION_NONE is not set # CT_GLIBC_KERNEL_VERSION_NONE is not set
# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set # CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
CT_GLIBC_KERNEL_VERSION_CHOSEN=y CT_GLIBC_KERNEL_VERSION_CHOSEN=y
CT_GLIBC_MIN_KERNEL_VERSION="3.2.0" CT_GLIBC_MIN_KERNEL_VERSION="2.6.9"
CT_GLIBC_MIN_KERNEL="3.2.0" CT_GLIBC_MIN_KERNEL="2.6.9"
# CT_GLIBC_ENABLE_COMMON_FLAG is not set # CT_GLIBC_ENABLE_COMMON_FLAG is not set
CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG" CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_ANY=y
@ -482,8 +483,7 @@ CT_LIBC_SUPPORT_THREADS_NATIVE=y
# Common C library options # Common C library options
# #
CT_THREADS_NATIVE=y CT_THREADS_NATIVE=y
CT_CREATE_LDSO_CONF=y # CT_CREATE_LDSO_CONF is not set
CT_LDSO_CONF_EXTRA_DIRS_ARRAY=""
CT_LIBC_XLDD=y CT_LIBC_XLDD=y
# end of C-library # end of C-library
@ -516,12 +516,12 @@ CT_GCC_PATCH_ORDER="global"
# CT_GCC_V_11 is not set # CT_GCC_V_11 is not set
# CT_GCC_V_10 is not set # CT_GCC_V_10 is not set
# CT_GCC_V_9 is not set # CT_GCC_V_9 is not set
CT_GCC_V_8=y # CT_GCC_V_8 is not set
# CT_GCC_V_7 is not set # CT_GCC_V_7 is not set
# CT_GCC_V_6 is not set CT_GCC_V_6=y
# CT_GCC_V_5 is not set # CT_GCC_V_5 is not set
# CT_GCC_V_4_9 is not set # CT_GCC_V_4_9 is not set
CT_GCC_VERSION="8.5.0" CT_GCC_VERSION="6.5.0"
CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -533,10 +533,10 @@ CT_GCC_10_or_older=y
CT_GCC_older_than_10=y CT_GCC_older_than_10=y
CT_GCC_9_or_older=y CT_GCC_9_or_older=y
CT_GCC_older_than_9=y CT_GCC_older_than_9=y
CT_GCC_later_than_8=y CT_GCC_8_or_older=y
CT_GCC_8_or_later=y CT_GCC_older_than_8=y
CT_GCC_later_than_7=y CT_GCC_7_or_older=y
CT_GCC_7_or_later=y CT_GCC_older_than_7=y
CT_GCC_later_than_6=y CT_GCC_later_than_6=y
CT_GCC_6_or_later=y CT_GCC_6_or_later=y
CT_GCC_later_than_5=y CT_GCC_later_than_5=y
@ -546,9 +546,8 @@ CT_GCC_4_9_or_later=y
CT_CC_GCC_ENABLE_PLUGINS=y CT_CC_GCC_ENABLE_PLUGINS=y
CT_CC_GCC_HAS_LIBMPX=y CT_CC_GCC_HAS_LIBMPX=y
CT_CC_GCC_ENABLE_CXX_FLAGS="" CT_CC_GCC_ENABLE_CXX_FLAGS=""
CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-targets=all" CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-targets=all" CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
CT_CC_GCC_MULTILIB_LIST=""
CT_CC_GCC_STATIC_LIBSTDCXX=y CT_CC_GCC_STATIC_LIBSTDCXX=y
# CT_CC_GCC_SYSTEM_ZLIB is not set # CT_CC_GCC_SYSTEM_ZLIB is not set
CT_CC_GCC_CONFIG_TLS=m CT_CC_GCC_CONFIG_TLS=m
@ -607,22 +606,7 @@ CT_CC_LANG_CXX=y
# #
# Debug facilities # Debug facilities
# #
CT_DEBUG_DUMA=y # CT_DEBUG_DUMA is not set
CT_DEBUG_DUMA_PKG_KSYM="DUMA"
CT_DUMA_DIR_NAME="duma"
CT_DUMA_PKG_NAME="duma"
CT_DUMA_SRC_RELEASE=y
# CT_DUMA_SRC_DEVEL is not set
CT_DUMA_PATCH_ORDER="global"
CT_DUMA_V_2_5_15=y
CT_DUMA_VERSION="2_5_15"
CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
CT_DUMA_SIGNATURE_FORMAT=""
CT_DUMA_SO=y
CT_DUMA_CUSTOM_WRAPPER=y
# CT_DEBUG_GDB is not set # CT_DEBUG_GDB is not set
# CT_DEBUG_LTRACE is not set # CT_DEBUG_LTRACE is not set
CT_DEBUG_STRACE=y CT_DEBUG_STRACE=y