Merge pull request #178310 from minijackson/add-microblaze

Add MicroBlaze architecture
NixOS · Aug 25, 2022 · 6943487 · 6943487
2 parents 3d4de2a + bec06f5
commit 6943487
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
@@ -121,6 +121,8 @@ rec {
  else if final.isAarch64 then "arm64"
  else if final.isx86_32 then "i386"
  else if final.isx86_64 then "x86_64"
+ # linux kernel does not distinguish microblaze/microblazeel
+ else if final.isMicroBlaze then "microblaze"
  else if final.isMips32 then "mips"
  else if final.isMips64 then "mips" # linux kernel does not distinguish mips32/mips64
  else if final.isPower then "powerpc"

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
@@ -26,9 +26,10 @@ let
 
  # Linux
  "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
- "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" "mips64el-linux"
- "powerpc64-linux" "powerpc64le-linux" "riscv32-linux"
- "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux"
+ "armv7l-linux" "i686-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"
 
  # MMIXware
  "mmix-mmixware"
@@ -40,9 +41,9 @@ let
 
  # none
  "aarch64_be-none" "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none"
- "msp430-none" "or1k-none" "m68k-none" "powerpc-none" "powerpcle-none"
- "riscv32-none" "riscv64-none" "rx-none" "s390-none" "s390x-none" "vc4-none"
- "x86_64-none"
+ "microblaze-none" "microblazeel-none" "msp430-none" "or1k-none" "m68k-none"
+ "powerpc-none" "powerpcle-none" "riscv32-none" "riscv64-none" "rx-none"
+ "s390-none" "s390x-none" "vc4-none" "x86_64-none"
 
  # OpenBSD
  "i686-openbsd" "x86_64-openbsd"
@@ -71,6 +72,7 @@ in {
  x86 = filterDoubles predicates.isx86;
  i686 = filterDoubles predicates.isi686;
  x86_64 = filterDoubles predicates.isx86_64;
+ microblaze = filterDoubles predicates.isMicroBlaze;
  mips = filterDoubles predicates.isMips;
  mmix = filterDoubles predicates.isMmix;
  riscv = filterDoubles predicates.isRiscV;

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
@@ -17,6 +17,7 @@ rec {
  isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
  isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
  isAarch = { cpu = { family = "arm"; }; };
+ isMicroBlaze = { cpu = { family = "microblaze"; }; };
  isMips = { cpu = { family = "mips"; }; };
  isMips32 = { cpu = { family = "mips"; bits = 32; }; };
  isMips64 = { cpu = { family = "mips"; bits = 64; }; };

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
@@ -88,6 +88,9 @@ rec {
  i686 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i686"; };
  x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; arch = "x86-64"; };
 
+ microblaze = { bits = 32; significantByte = bigEndian; family = "microblaze"; };
+ microblazeel = { bits = 32; significantByte = littleEndian; family = "microblaze"; };
+
  mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
  mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
  mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };

diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
@@ -31,7 +31,7 @@ with lib.systems.doubles; lib.runTests {
  testredox = mseteq redox [ "x86_64-redox" ];
  testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
  testillumos = mseteq illumos [ "x86_64-solaris" ];
- testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ];
+ testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" ];
  testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
  testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
  testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
@@ -496,6 +496,8 @@ stdenv.mkDerivation {
  hardening_unsupported_flags+=" format"
  '' + optionalString targetPlatform.isWasm ''
  hardening_unsupported_flags+=" stackprotector fortify pie pic"
+ '' + optionalString targetPlatform.isMicroBlaze ''
+ hardening_unsupported_flags+=" stackprotector"
  ''
 
  + optionalString (libc != null && targetPlatform.isAvr) ''