Unverified Commit dfc5d783 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #35247 from telent/mips32 

lib, treewide: Add missing MIPS arches, and fix existing usage
parents ac4e65ce 9c50ae68

doc/meta.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ $ nix-env -qa hello --json 
                "x86_64-linux",

                "armv5tel-linux",

                "armv7l-linux",

                "mips64el-linux",

                "mips32-linux",

                "x86_64-darwin",

                "i686-cygwin",

                "i686-freebsd",

lib/systems/doubles.nix

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ let 
    "aarch64-linux"

    "armv5tel-linux" "armv6l-linux" "armv7l-linux"



    "mips64el-linux"

    "mipsel-linux"



    "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"

lib/systems/examples.nix

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ rec { 
  };



  fuloongminipc = rec {

    config = "mips64el-unknown-linux-gnu";

    config = "mipsel-unknown-linux-gnu";

    arch = "mips";

    float = "hard";

    platform = platforms.fuloong2f_n32;

lib/systems/parse.nix

+4 −1
Original line number Diff line number Diff line
@@ -75,7 +75,10 @@ rec { 
    aarch64  = { bits = 64; significantByte = littleEndian; family = "aarch64"; };

    i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };

    x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };

    mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };

    mips     = { bits = 32; significantByte = bigEndian;    family = "mips"; };

    mipsel   = { bits = 32; significantByte = littleEndian; family = "mips"; };

    mips64   = { bits = 64; significantByte = bigEndian;    family = "mips"; };

    mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };

    powerpc  = { bits = 32; significantByte = bigEndian;    family = "power"; };

    riscv32  = { bits = 32; significantByte = littleEndian; family = "riscv"; };

    riscv64  = { bits = 64; significantByte = littleEndian; family = "riscv"; };

lib/systems/platforms.nix

+1 −1
Original line number Diff line number Diff line
@@ -561,6 +561,6 @@ rec { 
      "armv6l-linux" = raspberrypi;

      "armv7l-linux" = armv7l-hf-multiplatform;

      "aarch64-linux" = aarch64-multiplatform;

      "mips64el-linux" = fuloong2f_n32;

      "mipsel-linux" = fuloong2f_n32;

    }.${system} or pcBase;

}