diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-03-19 22:41:06 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-25 15:50:41 -0400 |
commit | b9acfb4ecfbbdac123fed170f5b2806fe4e846d0 (patch) | |
tree | cfd0baad9c35b8cd8d482482296ce1313f453277 /pkgs/development/libraries/glibc | |
parent | 1a72330ab067cb3c48c6e6ef3d5e0d2d24a95417 (diff) | |
download | nixpkgs-b9acfb4ecfbbdac123fed170f5b2806fe4e846d0.tar nixpkgs-b9acfb4ecfbbdac123fed170f5b2806fe4e846d0.tar.gz nixpkgs-b9acfb4ecfbbdac123fed170f5b2806fe4e846d0.tar.bz2 nixpkgs-b9acfb4ecfbbdac123fed170f5b2806fe4e846d0.tar.lz nixpkgs-b9acfb4ecfbbdac123fed170f5b2806fe4e846d0.tar.xz nixpkgs-b9acfb4ecfbbdac123fed170f5b2806fe4e846d0.tar.zst nixpkgs-b9acfb4ecfbbdac123fed170f5b2806fe4e846d0.zip |
treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for 32-bit ARM instruction set. This is confusing to non packagers though, because Aarch64 is an ARM instruction set. The official ARM overview for ARMv8[1] is surprisingly not confusing, given the overall state of affairs for ARM naming conventions, and offers us a solution. It divides the nomenclature into three levels: ``` ISA: ARMv8 {-A, -R, -M} / \ Mode: Aarch32 Aarch64 | / \ Encoding: A64 A32 T32 ``` At the top is the overall v8 instruction set archicture. Second are the two modes, defined by bitwidth but differing in other semantics too, and buttom are the encodings, (hopefully?) isomorphic if they encode the same mode. The 32 bit encodings are mostly backwards compatible with previous non-Thumb and Thumb encodings, and if so we can pun the mode names to instead mean "sets of compatable or isomorphic encodings", and then voilĂ we have nice names for 32-bit and 64-bit arm instruction sets which do not use the word ARM so as to not confused either laymen or experienced ARM packages. [1]: https://developer.arm.com/products/architecture/a-profile (cherry picked from commit ba52ae50488de85a9cf60a3a04f1c9ca7122ec74)
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r-- | pkgs/development/libraries/glibc/common-2.27.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix index 6c443ebbb93..272e18905c1 100644 --- a/pkgs/development/libraries/glibc/common-2.27.nix +++ b/pkgs/development/libraries/glibc/common-2.27.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation ({ (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ + ] ++ lib.optionals (cross == null && stdenv.isAarch32) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d40733adf87..5179ce4a9a8 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation ({ (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ + ] ++ lib.optionals (cross == null && stdenv.isAarch32) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" |