From 909eeac5b06bdcb12c30d80958c076e8cf3d983f Mon Sep 17 00:00:00 2001 From: strawberry Date: Fri, 6 Sep 2024 19:02:04 -0400 Subject: [PATCH] drop target CPU for aarch64 to cortex-a53 instead of cortex-a73 Signed-off-by: strawberry --- nix/pkgs/main/cross-compilation-env.nix | 2 +- nix/pkgs/main/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/pkgs/main/cross-compilation-env.nix b/nix/pkgs/main/cross-compilation-env.nix index 75b5862f..3f4d593b 100644 --- a/nix/pkgs/main/cross-compilation-env.nix +++ b/nix/pkgs/main/cross-compilation-env.nix @@ -18,7 +18,7 @@ lib.optionalAttrs stdenv.hostPlatform.isStatic { [ "-C" "target-cpu=x86-64-v2" ] ++ lib.optionals stdenv.targetPlatform.isAarch64 - [ "-C" "target-cpu=cortex-a55" ] # cortex-a55 == ARMv8.2-a + [ "-C" "target-cpu=cortex-a53" ] # cortex-a53 == ARMv8-A # This disables PIE for static builds, which isn't great in terms # of security. Unfortunately, my hand is forced because nixpkgs' # `libstdc++.a` is built without `-fPIE`, which precludes us from diff --git a/nix/pkgs/main/default.nix b/nix/pkgs/main/default.nix index 47b98432..31a2b7aa 100644 --- a/nix/pkgs/main/default.nix +++ b/nix/pkgs/main/default.nix @@ -97,7 +97,7 @@ buildDepsOnlyEnv = else if stdenv.targetPlatform.isAarch64 then lib.subtractLists [ "-DPORTABLE=1" ] old.cmakeFlags ++ lib.optionals stdenv.targetPlatform.isAarch64 [ - # cortex-a73 == ARMv8-A + # cortex-a53 == ARMv8-A "-DPORTABLE=armv8-a" ] else old.cmakeFlags; @@ -131,7 +131,7 @@ buildPackageEnv = { + lib.optionalString stdenv.targetPlatform.isx86_64 " -Ctarget-cpu=x86-64-v2" + lib.optionalString stdenv.targetPlatform.isAarch64 - " -Ctarget-cpu=cortex-a73"; # cortex-a73 == ARMv8-A + " -Ctarget-cpu=cortex-a53"; # cortex-a53 == ARMv8-A };