Merge branch 'master' into add_tinycc

Merge remote-tracking branch 'origin/master' into add_tinycc
Fix merge
2025-06-17 16:39:25 +02:00 · 2021-08-10 21:22:16 +02:00 · 2021-08-10 00:46:39 +02:00 · 2021-08-07 13:35:38 +02:00 · 2021-08-07 01:04:38 +02:00 · 2021-08-06 23:09:08 +02:00
5 changed files with 48 additions and 3 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -55,7 +55,7 @@ jobs:
          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]
+          linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-x64-tinycc, linux-xtensa-uclibc]
    steps:
      - uses: actions/checkout@v2
      - uses: actions/download-artifact@v2
--- a/4
+++ b/4
@ -15,7 +15,7 @@ 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 \
@ -32,7 +32,7 @@ GEN_IMAGES = android-arm android-arm64 \
 	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/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 "$@"
Author	SHA1	Message	Date
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