commit 5fc5e83808c1f9ce5b414a1d596f6427b77ac180 · pyrox.dev/nixpkgs

+3 -2

lib/systems/doubles.nix

···

       24
       24
        
       

     

       25
       25
        
           "x86_64-redox"

     

       26
       26
        
       

     

       27
       27
       +
           "powerpc64-linux"

     

       27
       28
        
           "powerpc64le-linux"

     

       28
       29
        
       

     

       29
       30
        
           "riscv32-linux" "riscv64-linux"

     
···

       72
       73
        
         darwin        = filterDoubles predicates.isDarwin;

     

       73
       74
        
         freebsd       = filterDoubles predicates.isFreeBSD;

     

       74
       75
        
         # Should be better, but MinGW is unclear.

     

       75
       75
       -
         gnu           = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; });

     

       76
       76
       +
         gnu           = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.elfv1; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.elfv2; });

     

       76
       77
        
         illumos       = filterDoubles predicates.isSunOS;

     

       77
       78
        
         linux         = filterDoubles predicates.isLinux;

     

       78
       79
        
         netbsd        = filterDoubles predicates.isNetBSD;

     
···

       85
       86
        
       

     

       86
       87
        
         embedded      = filterDoubles predicates.isNone;

     

       87
       88
        
       

     

       88
       88
       -
         mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"];

     

       89
       89
       +
         mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux"];

     

       89
       90
        
       }

+13

lib/systems/examples.nix

···

       21
       21
        
           config = "powerpc64le-unknown-linux-musl";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       +
         ppc64-elfv1 = {

     

       25
       25
       +
           config = "powerpc64-unknown-linux-elfv1";

     

       26
       26
       +
         };

     

       27
       27
       +
         ppc64-elfv2 = {

     

       28
       28
       +
           config = "powerpc64-unknown-linux-elfv2";

     

       29
       29
       +
         };

     

       30
       30
       +
         ppc64 = ppc64-elfv2; # default to modern elfv2

     

       31
       31
       +
       

     

       32
       32
       +
         ppc64-musl = {

     

       33
       33
       +
           config = "powerpc64-unknown-linux-musl";

     

       34
       34
       +
           gcc = { abi = "elfv2"; }; # for gcc configuration

     

       35
       35
       +
         };

     

       36
       36
       +
       

     

       24
       37
        
         sheevaplug = {

     

       25
       38
        
           config = "armv5tel-unknown-linux-gnueabi";

     

       26
       39
        
         } // platforms.sheevaplug;

+9

lib/systems/parse.nix

···

       337
       337
        
                   The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead.

     

       338
       338
        
                 '';

     

       339
       339
        
               }

     

       340
       340
       +
               { assertion = platform: platform.system != "powerpc64-linux";

     

       341
       341
       +
                 message = ''

     

       342
       342
       +
                   The "gnu" ABI is ambiguous on big-endian 64-bit PPC. Use "elfv1" or "elfv2" instead.

     

       343
       343
       +
                 '';

     

       344
       344
       +
               }

     

       340
       345
        
             ];

     

       341
       346
        
           };

     

       342
       347
        
           gnuabi64     = { abi = "64"; };

     

       348
       348
       +
       

     

       349
       349
       +
           elfv1        = { abi = "elfv1"; };

     

       350
       350
       +
           elfv2        = { abi = "elfv2"; };

     

       343
       351
        
       

     

       344
       352
        
           musleabi     = { float = "soft"; };

     

       345
       353
        
           musleabihf   = { float = "hard"; };

     
···

       444
       452
        
                   if lib.versionAtLeast (parsed.cpu.version or "0") "6"

     

       445
       453
        
                   then abis.gnueabihf

     

       446
       454
        
                   else abis.gnueabi

     

       455
       455
       +
                 else if cpu == "powerpc64" then abis.elfv2

     

       447
       456
        
                 else abis.gnu

     

       448
       457
        
               else                     abis.unknown;

     

       449
       458
        
           };

+1 -1

lib/tests/systems.nix

···

       28
       28
        
         testredox = mseteq redox [ "x86_64-redox" ];

     

       29
       29
        
         testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);

     

       30
       30
        
         testillumos = mseteq illumos [ "x86_64-solaris" ];

     

       31
       31
       -
         testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ];

     

       31
       31
       +
         testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ];

     

       32
       32
        
         testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];

     

       33
       33
        
         testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];

     

       34
       34
        
         testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];

+1 -1

pkgs/development/compilers/gcc/common/platform-flags.nix

···

       11
       11
        
         (lib.optional (p ? float) "--with-float=${p.float}")

     

       12
       12
        
         (lib.optional (p ? mode) "--with-mode=${p.mode}")

     

       13
       13
        
         (lib.optional

     

       14
       14
       -
           (let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit && tp.isLittleEndian)

     

       14
       14
       +
           (let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit)

     

       15
       15
        
           "--with-long-double-128")

     

       16
       16
        
       ]

+1

pkgs/stdenv/default.nix

···

       54
       54
        
           aarch64-linux = stagesLinux;

     

       55
       55
        
           mipsel-linux = stagesLinux;

     

       56
       56
        
           powerpc-linux = /* stagesLinux */ stagesNative;

     

       57
       57
       +
           powerpc64-linux = stagesLinux;

     

       57
       58
        
           powerpc64le-linux = stagesLinux;

     

       58
       59
        
           x86_64-darwin = stagesDarwin;

     

       59
       60
        
           x86_64-solaris = stagesNix;

+2

pkgs/stdenv/linux/make-bootstrap-tools-cross.nix

···

       17
       17
        
         armv6l-musl  = muslpi;

     

       18
       18
        
         aarch64-musl = aarch64-multiplatform-musl;

     

       19
       19
        
         riscv64 = riscv64;

     

       20
       20
       +
         powerpc64 = ppc64;

     

       21
       21
       +
         powerpc64-musl = ppc64-musl;

     

       20
       22
        
         powerpc64le = powernv;

     

       21
       23
        
         powerpc64le-musl = musl-power;

     

       22
       24
        
       })

+2 -1

pkgs/stdenv/linux/make-bootstrap-tools.nix

···

       19
       19
        
         tarMinimal = gnutar.override { acl = null; };

     

       20
       20
        
       

     

       21
       21
        
         busyboxMinimal = busybox.override {

     

       22
       22
       -
           useMusl = !stdenv.targetPlatform.isRiscV;

     

       22
       22
       +
           useMusl = with stdenv.targetPlatform; !isRiscV &&

     

       23
       23
       +
                       (system == "powerpc64-linux" -> parsed.abi.name != "elfv1");

     

       23
       24
        
           enableStatic = true;

     

       24
       25
        
           enableMinimal = true;

     

       25
       26
        
           extraConfig = ''