Unverified Commit 85a45c2a authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents a2b4fe3b cfe96dbf

lib/systems/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ rec { 
        else if final.isPower then "powerpc"

        else if final.isRiscV then "riscv"

        else if final.isS390 then "s390"

        else if final.isLoongArch64 then "loongarch"

        else final.parsed.cpu.name;



      qemuArch =

lib/systems/doubles.nix

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ let 


    # Linux

    "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"

    "armv7l-linux" "i686-linux" "m68k-linux" "microblaze-linux"

    "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux"

    "microblazeel-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux"

    "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux"

    "s390x-linux" "x86_64-linux"
@@ -86,6 +86,7 @@ in { 
  m68k          = filterDoubles predicates.isM68k;

  s390          = filterDoubles predicates.isS390;

  s390x         = filterDoubles predicates.isS390x;

  loongarch64   = filterDoubles predicates.isLoongArch64;

  js            = filterDoubles predicates.isJavaScript;



  bigEndian     = filterDoubles predicates.isBigEndian;

lib/systems/examples.nix

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ rec { 
    config = "mipsel-unknown-linux-gnu";

  } // platforms.fuloong2f_n32;



  loongarch64-linux = {

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

  };



  # can execute on 32bit chip

  mips-linux-gnu                = { config = "mips-unknown-linux-gnu";                } // platforms.gcc_mips32r2_o32;

  mipsel-linux-gnu              = { config = "mipsel-unknown-linux-gnu";              } // platforms.gcc_mips32r2_o32;

lib/systems/inspect.nix

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ rec { 
    isM68k         = { cpu = { family = "m68k"; }; };

    isS390         = { cpu = { family = "s390"; }; };

    isS390x        = { cpu = { family = "s390"; bits = 64; }; };

    isLoongArch64  = { cpu = { family = "loongarch"; bits = 64; }; };

    isJavaScript   = { cpu = cpuTypes.javascript; };



    is32bit        = { cpu = { bits = 32; }; };

lib/systems/parse.nix

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ rec { 


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



    loongarch64 = { bits = 64; significantByte = littleEndian; family = "loongarch"; };



    javascript = { bits = 32; significantByte = littleEndian; family = "javascript"; };

  };