naive wip for sharing purposes

goertzenator · Nov 22, 2018 · 66754fb · Ericson2314 · Nov 28, 2018 · goertzenator
1 parent f6e03ec
commit 66754fb
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 6 deletions.
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
@@ -12,11 +12,14 @@ let
     "mipsel-linux"
 
     "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"
+    "i586-cygwin" "i586-freebsd" "i586-linux" "i586-netbsd" "i586-openbsd"
+    "i486-cygwin" "i486-freebsd" "i486-linux" "i486-netbsd" "i486-openbsd"
+    "i386-cygwin" "i386-freebsd" "i386-linux" "i386-netbsd" "i386-openbsd"
 
     "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux"
     "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
 
-    "x86_64-windows" "i686-windows"
+    "x86_64-windows" "i686-windows" "i586-windows"
   ];
 
   allParsed = map parse.mkSystemFromString all;
@@ -31,7 +34,11 @@ in rec {
   arm     = filterDoubles predicates.isAarch32;
   aarch64 = filterDoubles predicates.isAarch64;
   x86     = filterDoubles predicates.isx86;
+  i386    = filterDoubles predicates.isi386;
+  i486    = filterDoubles predicates.isi486;
+  i586    = filterDoubles predicates.isi586;
   i686    = filterDoubles predicates.isi686;
+  x86_32  = filterDoubles predicates.isx86_32;
   x86_64  = filterDoubles predicates.isx86_64;
   mips    = filterDoubles predicates.isMips;
 

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
@@ -12,7 +12,11 @@ in rec {
   arm     = [ patterns.isAarch32 ];
   aarch64 = [ patterns.isAarch64 ];
   x86     = [ patterns.isx86 ];
+  i386    = [ patterns.isi386 ];
+  i486    = [ patterns.isi486 ];
+  i586    = [ patterns.isi586 ];
   i686    = [ patterns.isi686 ];
+  x86_32  = [ patterns.isx86_32 ];
   x86_64  = [ patterns.isx86_64 ];
   mips    = [ patterns.isMips ];
   riscv   = [ patterns.isRiscV ];

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
@@ -8,8 +8,12 @@ let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis
 
 rec {
   patterns = rec {
+    isi386         = { cpu = cpuTypes.i386; };
+    isi486         = { cpu = cpuTypes.i486; };
+    isi586         = { cpu = cpuTypes.i586; };
     isi686         = { cpu = cpuTypes.i686; };
-    isx86_64       = { cpu = cpuTypes.x86_64; };
+    isx86_32       = { cpu = { family = "x86"; bits = 32; }; };
+    isx86_64       = { cpu = { family = "x86"; bits = 64; }; };
     isPowerPC      = { cpu = cpuTypes.powerpc; };
     isPower = { cpu = { family = "power"; }; };
     isx86          = { cpu = { family = "x86"; }; };

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
@@ -82,6 +82,9 @@ rec {
     aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; };
     aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; };
 
+    i386     = { bits = 32; significantByte = littleEndian; family = "x86"; };
+    i486     = { bits = 32; significantByte = littleEndian; family = "x86"; };
+    i586     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
 

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
@@ -467,6 +467,9 @@ rec {
   };
 
   selectBySystem = system: {
+      "i386-linux" = pc32;
+      "i486-linux" = pc32;
+      "i586-linux" = pc32;
       "i686-linux" = pc32;
       "x86_64-linux" = pc64;
       "armv5tel-linux" = sheevaplug;

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
@@ -177,7 +177,7 @@ stdenv.mkDerivation {
       /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
       else if targetPlatform.isAarch32     then endianPrefix + "arm"
       else if targetPlatform.isx86_64  then "x86-64"
-      else if targetPlatform.isi686    then "i386"
+      else if targetPlatform.isx86_32  then "i386"
       else if targetPlatform.isMips    then {
           "mips"     = "btsmipn32"; # n32 variant
           "mipsel"   = "ltsmipn32"; # n32 variant

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
@@ -289,7 +289,7 @@ stdenv.mkDerivation ({
     optional (!bootstrap) "--disable-bootstrap" ++
 
     # Platform-specific flags
-    optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
+    optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
     optionals hostPlatform.isSunOS [
       "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
       # On Illumos/Solaris GNU as is preferred

diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -135,7 +135,7 @@ in stdenv.mkDerivation (rec {
     ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
   '';
 
-  doCheck = stdenv.isLinux && (!stdenv.isi686);
+  doCheck = stdenv.isLinux && (!stdenv.isx86_32);
 
   checkTarget = "check-all";
 

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -432,7 +432,7 @@ let
 
       VFIO_PCI_VGA = when stdenv.is64bit yes;
 
-    } // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
+    } // optionalAttrs stdenv.isx86 ({
       XEN = option yes;
 
       # XXX: why isn't this in the xen-dom0 conditional section below?