cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #249439 from amjoseph-nixpkgs/pr/stdenv/libgcc-no-more-cycles-armv5-and-armv6

Browse source 
libgcc: build arm-{isa,cpu}.h for all 32-bit arm, not just armv7
This commit is contained in:
Adam Joseph 2023-08-17 04:55:14 +00:00 committed by GitHub
commit 53a053cb55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/gcc/libgcc/default.nix
View file

@ -90,7 +90,7 @@ in stdenv.mkDerivation (finalAttrs: {
insn-constants.h \ insn-constants.h \
'' + lib.optionalString stdenv.targetPlatform.isM68k '' '' + lib.optionalString stdenv.targetPlatform.isM68k ''
sysroot-suffix.h \ sysroot-suffix.h \
'' + lib.optionalString stdenv.targetPlatform.isArmv7 '' '' + lib.optionalString stdenv.targetPlatform.isAarch32 ''
arm-isa.h \ arm-isa.h \
arm-cpu.h \ arm-cpu.h \
'' + '' '' + ''

2
pkgs/test/cross/default.nix
View file

@ -135,6 +135,8 @@ let
pkgs.pkgsLLVM.stdenv pkgs.pkgsLLVM.stdenv
pkgs.pkgsStatic.bash pkgs.pkgsStatic.bash
pkgs.pkgsCross.arm-embedded.stdenv 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.armv7l-hf-multiplatform.stdenv
pkgs.pkgsCross.m68k.stdenv pkgs.pkgsCross.m68k.stdenv
pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc