From 03e4389bf8dc35a57065952f61ca048808ce9e23 Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Sat, 15 May 2021 17:36:36 +0200
Subject: [PATCH] Add cc65 compiler and fix

---
 .github/workflows/main.yml             | 3 ++-
 .gitmodules                            | 3 +++
 cc65                                   | 1 +
 linux-mips64el-n64/crosstool-ng.config | 3 ++-
 linux-x64/Dockerfile.in                | 2 --
 linux-x86/Dockerfile.in                | 2 --
 6 files changed, 8 insertions(+), 6 deletions(-)
 create mode 160000 cc65

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 36fa946..e0aa328 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-#      max-parallel: 3
+      max-parallel: 8
 # manylinux2014-aarch64
       matrix:
         arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-armv8, linux-armv8-musl, linux-armv8-rpi3, linux-armv8-rpi4, linux-armv5, linux-armv5-musl, linux-armv6-rpi1, linux-armv7-rpi2, linux-armv6-musl, linux-armv6-rpi-old, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-mips, linux-mips64, linux-mips64el-n64, linux-mipsel, linux-m68k, linux-ppc32, linux-ppc64, linux-s390x, linux-x64, linux-x64-clang, linux-x86, linux-riscv64, manylinux2014-x64, manylinux2014-x86, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
@@ -71,6 +71,7 @@ jobs:
         run: docker image rm -f bensuperpc/${{ matrix.arch_name }}
   image_full:
     name: ${{ matrix.arch_name }}
+    if: always()
     needs: image
     runs-on: ubuntu-20.04
     strategy:
diff --git a/.gitmodules b/.gitmodules
index c508c2d..13cb466 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "pvsneslib"]
 	path = pvsneslib
 	url = https://github.com/Bensuperpc/pvsneslib-docker.git
+[submodule "cc65"]
+	path = cc65
+	url = https://github.com/Bensuperpc/cc65-docker.git
diff --git a/cc65 b/cc65
new file mode 160000
index 0000000..b6911a5
--- /dev/null
+++ b/cc65
@@ -0,0 +1 @@
+Subproject commit b6911a513651348560435b7e6a040bfb8790d41e
diff --git a/linux-mips64el-n64/crosstool-ng.config b/linux-mips64el-n64/crosstool-ng.config
index fe6bd4b..e317c52 100644
--- a/linux-mips64el-n64/crosstool-ng.config
+++ b/linux-mips64el-n64/crosstool-ng.config
@@ -151,7 +151,8 @@ CT_ARCH_MIPS=y
 # CT_ARCH_XTENSA is not set
 CT_ARCH="mips"
 CT_ARCH_CHOICE_KSYM="MIPS"
-CT_ARCH_TUNE="mips64vr4300"
+CT_ARCH_TUNE=""
+CT_ARCH_CPU="mips64vr4300"
 CT_ARCH_MIPS_SHOW=y
 
 #
diff --git a/linux-x64/Dockerfile.in b/linux-x64/Dockerfile.in
index d4d9c8b..77c946e 100644
--- a/linux-x64/Dockerfile.in
+++ b/linux-x64/Dockerfile.in
@@ -23,6 +23,4 @@ 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.lib"
-
 #include "common.label-and-env"
diff --git a/linux-x86/Dockerfile.in b/linux-x86/Dockerfile.in
index f47c0cd..52b3c26 100644
--- a/linux-x86/Dockerfile.in
+++ b/linux-x86/Dockerfile.in
@@ -44,6 +44,4 @@ ENV ARCH x86
 COPY linux32-entrypoint.sh /dockcross/
 ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
 
-#include "common.lib"
-
 #include "common.label-and-env"