Merge remote-tracking branch 'upstream/master' into mingw-mcfthreads

2019-11-11 20:48:14 -05:00
parent 63eac67319 e3b76760e3
commit 16f0fe7fe3
4983 changed files with 152349 additions and 86073 deletions
@@ -79,6 +79,7 @@ rec {
        else if final.isAarch64 then "arm64"
        else if final.isx86_32 then "x86"
        else if final.isx86_64 then "ia64"
+        else if final.isMips then "mips"
        else final.parsed.cpu.name;

      qemuArch =
@@ -330,6 +330,7 @@ rec {
        }
      ];
    };
+    gnuabi64     = { abi = "64"; };

    musleabi     = { float = "soft"; };
    musleabihf   = { float = "hard"; };