Fix build

Fix build Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
Update Readme and Makefile
2025-06-18 00:49:25 +02:00 · 2021-08-11 18:32:57 +02:00 · 2021-08-11 10:58:03 +02:00 · 2021-08-11 09:57:34 +02:00 · 2021-08-11 09:57:26 +02:00 · 2021-08-11 08:05:45 +02:00
10 changed files with 170 additions and 8 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -53,9 +53,9 @@ jobs:
          linux-x64-clang, linux-s390x, linux-x64, linux-x86, 
          linux-mips, linux-ppc64le, web-wasm,
          manylinux2014-x64, manylinux2014-x86,
-          windows-static-x64, windows-static-x64-posix, windows-static-x86, 
-          windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, 
-          linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-xtensa-uclibc]
+          windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-armv7,
+          windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, windows-arm64, 
+          linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-xtensa-uclibc, linux-x64-tinycc]
    steps:
      - uses: actions/checkout@v2
      - uses: actions/download-artifact@v2
--- a/10
+++ b/10
@ -15,24 +15,24 @@ BIN = ./bin
 # These images are built using the "build implicit rule"
 STANDARD_IMAGES = android-arm android-arm64 android-x86 android-x86_64 \
 	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-arm64-full \
-	linux-armv5 linux-armv5-musl linux-m68k-uclibc linux-s390x \
+	linux-armv5 linux-armv5-musl linux-m68k-uclibc linux-s390x linux-x64-tinycc \
 	linux-armv6 linux-armv6-lts linux-armv6-musl \
 	linux-armv7l-musl linux-armv7 linux-armv7a \
 	linux-mips linux-ppc64le linux-riscv64 linux-riscv32 linux-xtensa-uclibc \
-	windows-static-x86 windows-static-x64 windows-static-x64-posix \
-	windows-shared-x86 windows-shared-x64 windows-shared-x64-posix
+	windows-static-x86 windows-static-x64 windows-static-x64-posix windows-armv7 \
+	windows-shared-x86 windows-shared-x64 windows-shared-x64-posix windows-arm64

 # Generated Dockerfiles.
 GEN_IMAGES = android-arm android-arm64 \
 	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-arm64-full \
 	manylinux2014-x64 manylinux2014-x86 \
-	web-wasm linux-mips \
+	web-wasm linux-mips windows-arm64 windows-armv7 \
 	windows-static-x86 windows-static-x64 windows-static-x64-posix \
 	windows-shared-x86 windows-shared-x64 windows-shared-x64-posix \
 	linux-armv7 linux-armv7a linux-armv7l-musl \
 	linux-armv6 linux-armv6-lts linux-armv6-musl \
 	linux-armv5 linux-armv5-musl linux-ppc64le linux-s390x \
-	linux-riscv64 linux-riscv32 linux-m68k-uclibc linux-xtensa-uclibc
+	linux-riscv64 linux-riscv32 linux-m68k-uclibc linux-x64-tinycc linux-xtensa-uclibc

 GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))

--- a/README.md
+++ b/README.md
@ -102,6 +102,7 @@ The dockcross script will execute the given command-line inside the container, a
 | dockcross/linux-x86 | x86 | GCC | Linux |
 | dockcross/linux-x64 | x86_64 | GCC | Linux |
 | dockcross/linux-x64-clang | x86_64 | Clang | Linux |
+| dockcross/linux-x64-tinycc | x86_64 | tcc + GCC | Linux |
 | dockcross/web-wasm | JS | LLVM | Web (JS) |
 | dockcross/windows-shared-x86 | x86 | GCC | Windows |
 | dockcross/windows-shared-x64 | x86_64 | GCC | Windows |
@ -109,6 +110,8 @@ The dockcross script will execute the given command-line inside the container, a
 | dockcross/windows-static-x86 | x86 | GCC | Windows |
 | dockcross/windows-static-x64 | x86_64 | GCC | Windows |
 | dockcross/windows-static-x64-posix | x86_64 | GCC | Windows |
+| dockcross/windows-armv7 | ARMv7 | Clang | Windows |
+| dockcross/windows-arm64 | ARMv8 | Clang | Windows |

 ## Cross compilers

@ -269,6 +272,12 @@ Linux clang x86_64/amd64 compiler. Since the Docker image is natively x86_64, th

 Linux i686 cross compiler.

+### dockcross/linux-x64-tinycc
+
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x64-tinycc/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x64-tinycc)
+
+Linux tcc compiler for C compiler, and GCC for C++ compiler, for linux x86_64/amd64 arch.
+
 ### dockcross/manylinux2014-x64

 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2014-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2014-x64)
@ -325,6 +334,18 @@ linking.

 32-bit Windows cross-compiler based on [MXE/MinGW-w64](https://mxe.cc/) with win32 threads and dynamic linking.

+### dockcross/windows-armv7
+
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-armv7/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-armv7)
+
+ARMv7 32-bit Windows cross-compiler based on [LLVM/MinGW-w64](https://github.com/mstorsjo/llvm-mingw)
+
+### dockcross/windows-arm64
+
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-arm64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-arm64)
+
+ARMv8 64-bit Windows cross-compiler based on [llvm-mingw](https://github.com/mstorsjo/llvm-mingw)
+
 ## Summary legacy cross compilers

 The list of docker images that are no longer supported or broken
--- a/linux-x64-tinycc/Dockerfile.in
+++ b/linux-x64-tinycc/Dockerfile.in
@ -0,0 +1,31 @@
+FROM dockcross/base:latest
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+RUN git clone --recurse-submodules https://repo.or.cz/tinycc.git \
+    && cd tinycc \
+    && ./configure --cpu=x86_64 \
+    && make -j$(nproc) \
+    && make test \
+    && make install
+
+ENV PATH="/usr/local/bin:${PATH}"
+# Test if compiler work
+RUN tcc -v
+
+ENV CROSS_TRIPLE x86_64-linux-gnu
+ENV CROSS_ROOT /usr/bin
+ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
+    AR=/usr/bin/${CROSS_TRIPLE}-ar \
+    CC=/usr/local/bin/tcc \
+    CPP=/usr/bin/${CROSS_TRIPLE}-cpp \
+    CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
+    LD=/usr/bin/${CROSS_TRIPLE}-ld \
+    FC=/usr/bin/${CROSS_TRIPLE}-gfortran
+
+
+COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
+
+COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
+ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
+
+#include "common.label-and-env"
--- a/linux-x64-tinycc/Toolchain.cmake
+++ b/linux-x64-tinycc/Toolchain.cmake
@ -0,0 +1,12 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
+
+set(cross_triple "x86_64-linux-gnu")
+
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})
+set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
+
+set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop)
--- a/linux-x64-tinycc/x86_64-linux-gnu-noop.sh
+++ b/linux-x64-tinycc/x86_64-linux-gnu-noop.sh
@ -0,0 +1,2 @@
+#!/bin/sh
+exec "$@"
--- a/windows-arm64/Dockerfile.in
+++ b/windows-arm64/Dockerfile.in
@ -0,0 +1,29 @@
+FROM dockcross/base:latest
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+ENV XCC_PREFIX /usr/xcc
+ENV CROSS_TRIPLE aarch64-w64-mingw32
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross
+
+ARG DOWNLOAD_URL=https://github.com/mstorsjo/llvm-mingw/releases/download/20210423/llvm-mingw-20210423-msvcrt-ubuntu-18.04-x86_64.tar.xz
+ENV DOWNLOAD_URL=${DOWNLOAD_URL}
+
+RUN mkdir -p ${CROSS_ROOT} && wget -qO- "${DOWNLOAD_URL}" | tar xJvf - --strip 1 -C ${CROSS_ROOT}/ > /dev/null
+
+ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
+    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
+    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
+
+COPY Toolchain.cmake ${CROSS_ROOT}/
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
+
+# Linux kernel cross compilation variables
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm64
+
+#include "common.label-and-env"
--- a/windows-arm64/Toolchain.cmake
+++ b/windows-arm64/Toolchain.cmake
@ -0,0 +1,19 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})
+
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})
+
+set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")
+
+set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple})
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
+
+set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-aarch64)
--- a/windows-armv7/Dockerfile.in
+++ b/windows-armv7/Dockerfile.in
@ -0,0 +1,29 @@
+FROM dockcross/base:latest
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+ENV XCC_PREFIX /usr/xcc
+ENV CROSS_TRIPLE armv7-w64-mingw32
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross
+
+ARG DOWNLOAD_URL=https://github.com/mstorsjo/llvm-mingw/releases/download/20210423/llvm-mingw-20210423-msvcrt-ubuntu-18.04-x86_64.tar.xz
+ENV DOWNLOAD_URL=${DOWNLOAD_URL}
+
+RUN mkdir -p ${CROSS_ROOT} && wget -qO- "${DOWNLOAD_URL}" | tar xJvf - --strip 1 -C ${CROSS_ROOT}/ > /dev/null
+
+ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
+    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
+    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
+
+COPY Toolchain.cmake ${CROSS_ROOT}/
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
+
+# Linux kernel cross compilation variables
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm
+
+#include "common.label-and-env"
--- a/windows-armv7/Toolchain.cmake
+++ b/windows-armv7/Toolchain.cmake
@ -0,0 +1,19 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR arm)
+
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})
+
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})
+
+set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")
+
+set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple})
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
+
+set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)
Author	SHA1	Message	Date
Bensuperpc	a4cb929bef	Fix build Fix build Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-11 18:32:57 +02:00
Bensuperpc	84cab46099	Update Readme and Makefile Update Readme and Makefile Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-11 10:58:03 +02:00
Bensuperpc	4481ba2a8e	Merge pull request #557 from bensuperpc/add_windows_ARM64 Add windows arm64 and armv7	2021-08-11 09:57:34 +02:00
Bensuperpc	da8d9a8208	Merge branch 'master' into add_windows_ARM64	2021-08-11 09:57:26 +02:00
Bensuperpc	f84173c7e4	Merge pull request #555 from bensuperpc/Update_tools Update Readme and tools scripts	2021-08-11 08:05:45 +02:00
Bensuperpc	29ccbad9aa	Merge pull request #539 from bensuperpc/add_tinycc Add tinycc	2021-08-11 08:05:34 +02:00
Bensuperpc	5c45f72a87	Update Readme Update Readme Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-11 01:18:07 +02:00
Bensuperpc	526cab12a8	Add windows-armv7 Add windows-armv7 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-11 01:12:48 +02:00
Bensuperpc	92102d9138	Add windows-arm64 Add windows-arm64 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-11 01:07:37 +02:00
Bensuperpc	6a512eeb08	Merge branch 'master' into add_tinycc	2021-08-10 21:22:16 +02:00
Bensuperpc	88222c9793	Merge remote-tracking branch 'origin/master' into add_tinycc	2021-08-10 00:46:39 +02:00
Bensuperpc	e6e3cde831	Fix merge Fix merge Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-07 13:35:38 +02:00
Bensuperpc	1ce323ce7e	Merge branch 'master' into add_tinycc	2021-08-07 01:04:38 +02:00
Bensuperpc	47f1545e66	Fix merge Fix merge Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-06 23:09:08 +02:00
Bensuperpc	bd6d6d77d4	Merge remote-tracking branch 'origin/master' into add_tinycc	2021-08-05 16:58:52 +02:00
Bensuperpc	37ece838f8	Disable libgcc Disable libgcc Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-04 21:40:16 +02:00
Bensuperpc	bca0a99e99	Multi lines arch_name in CI Multi lines arch_name in CI Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-04 19:00:48 +02:00
Bensuperpc	3c74c2f0d2	Fix GCC build Fix GCC build Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-04 18:53:19 +02:00
Bensuperpc	d76d2ae8c5	Merge remote-tracking branch 'origin/HEAD' into add_tinycc	2021-08-04 18:20:35 +02:00
Bensuperpc	ed942b52f5	Add tinycc image Add tinycc image Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-04 14:24:19 +02:00