From dfb2f189af91d608cbc686edb01fc04df73da1fd Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 15 Aug 2023 19:10:21 -0700 Subject: [PATCH 1/2] libgcc: build arm-{isa,cpu}.h for all 32-bit arm, not just armv7 As reported here: https://github.com/NixOS/nixpkgs/pull/247900#issuecomment-1679258061 --- pkgs/development/libraries/gcc/libgcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index e2fbf55876fa..c168113fa3c4 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation (finalAttrs: { insn-constants.h \ '' + lib.optionalString stdenv.targetPlatform.isM68k '' sysroot-suffix.h \ - '' + lib.optionalString stdenv.targetPlatform.isArmv7 '' + '' + lib.optionalString stdenv.targetPlatform.isAarch32 '' arm-isa.h \ arm-cpu.h \ '' + '' From 360dc254fe174ad9f209f5a7a5507538fa76be7a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 15 Aug 2023 19:11:09 -0700 Subject: [PATCH 2/2] tests.cross.sanity: add armv5tel and armv6l --- pkgs/test/cross/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index d6fd8d3b1f80..ff83aedca123 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -135,6 +135,8 @@ let pkgs.pkgsLLVM.stdenv pkgs.pkgsStatic.bash pkgs.pkgsCross.arm-embedded.stdenv + pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel + pkgs.pkgsCross.raspberryPi.stdenv # for armv6l pkgs.pkgsCross.armv7l-hf-multiplatform.stdenv pkgs.pkgsCross.m68k.stdenv pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc