Merge commit '71186e73455a4e06e96a31da34b76f84e545ba1f' into gcc-simplify-flags

lib/systems/inspect.nix

@@ -1,20 +1,22 @@
 with import ./parse.nix;
 with import ../attrsets.nix;
+with import ../lists.nix;
 
 rec {
-  patterns = {
+  patterns = rec {
     "32bit"      = { cpu = { bits = 32; }; };
     "64bit"      = { cpu = { bits = 64; }; };
     i686         = { cpu = cpuTypes.i686; };
     x86_64       = { cpu = cpuTypes.x86_64; };
+    PowerPC      = { cpu = cpuTypes.powerpc; };
     x86          = { cpu = { family = "x86"; }; };
     Arm          = { cpu = { family = "arm"; }; };
     Mips         = { cpu = { family = "mips"; }; };
     BigEndian    = { cpu = { significantByte = significantBytes.bigEndian; }; };
     LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
 
-    Unix         = { kernel = { families = { inherit (kernelFamilies) unix; }; }; };
     BSD          = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
+    Unix         = [ BSD Darwin Linux SunOS Hurd Cygwin ];
 
     Darwin       = { kernel = kernels.darwin; };
     Linux        = { kernel = kernels.linux; };
@@ -27,11 +29,15 @@ rec {
     Cygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
     MinGW        = { kernel = kernels.windows; abi = abis.gnu; };
 
-    Arm32        = recursiveUpdate patterns.Arm patterns."32bit";
-    Arm64        = recursiveUpdate patterns.Arm patterns."64bit";
+    Arm32        = recursiveUpdate Arm patterns."32bit";
+    Arm64        = recursiveUpdate Arm patterns."64bit";
   };
 
+  matchAnyAttrs = patterns:
+    if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns
+    else matchAttrs patterns;
+
   predicates = mapAttrs'
-    (name: value: nameValuePair ("is" + name) (matchAttrs value))
+    (name: value: nameValuePair ("is" + name) (matchAnyAttrs value))
     patterns;
 }

lib/systems/parse.nix

@@ -44,7 +44,7 @@ rec {
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
     mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };
-    powerpc  = { bits = 32; significantByte = bigEndian;    family = "powerpc"; };
+    powerpc  = { bits = 32; significantByte = bigEndian;    family = "power"; };
   };
 
   isVendor = isType "vendor";
@@ -68,21 +68,20 @@ rec {
   isKernelFamily = isType "kernel-family";
   kernelFamilies = setTypes "kernel-family" {
     bsd = {};
-    unix = {};
   };
 
   isKernel = x: isType "kernel" x;
   kernels = with execFormats; with kernelFamilies; setTypesAssert "kernel"
     (x: isExecFormat x.execFormat && all isKernelFamily (attrValues x.families))
   {
-    darwin  = { execFormat = macho;   families = { inherit unix; }; };
-    freebsd = { execFormat = elf;     families = { inherit unix bsd; }; };
-    hurd    = { execFormat = elf;     families = { inherit unix; }; };
-    linux   = { execFormat = elf;     families = { inherit unix; }; };
-    netbsd  = { execFormat = elf;     families = { inherit unix bsd; }; };
-    none    = { execFormat = unknown; families = { inherit unix; }; };
-    openbsd = { execFormat = elf;     families = { inherit unix bsd; }; };
-    solaris = { execFormat = elf;     families = { inherit unix; }; };
+    darwin  = { execFormat = macho;   families = { }; };
+    freebsd = { execFormat = elf;     families = { inherit bsd; }; };
+    hurd    = { execFormat = elf;     families = { }; };
+    linux   = { execFormat = elf;     families = { }; };
+    netbsd  = { execFormat = elf;     families = { inherit bsd; }; };
+    none    = { execFormat = unknown; families = { }; };
+    openbsd = { execFormat = elf;     families = { inherit bsd; }; };
+    solaris = { execFormat = elf;     families = { }; };
     windows = { execFormat = pe;      families = { }; };
   } // { # aliases
     # TODO(@Ericson2314): Handle these Darwin version suffixes more generally.
@@ -164,7 +163,7 @@ rec {
   mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
 
   doubleFromSystem = { cpu, vendor, kernel, abi, ... }:
-    if vendor == kernels.windows && abi == abis.cygnus
+    if abi == abis.cygnus
     then "${cpu.name}-cygwin"
     else "${cpu.name}-${kernel.name}";
 

lib/systems/platforms.nix

@@ -543,6 +543,10 @@ rec {
 
       # Cavium ThunderX stuff.
       PCI_HOST_THUNDER_ECAM y
+
+      # The default (=y) forces us to have the XHCI firmware available in initrd,
+      # which our initrd builder can't currently do easily.
+      USB_XHCI_TEGRA m
     '';
     uboot = null;
     kernelTarget = "Image";