Skip to content

treewide: drop libatomic workaround for riscv #274827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickCao merged 7 commits into from
Dec 18, 2023
Merged

treewide: drop libatomic workaround for riscv #274827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e19bed4
numactl: drop libatomic workaround for riscv
NickCao Dec 16, 2023
c77ba71
mariadb: drop libatomic workaround for riscv
NickCao Dec 16, 2023
f197cb4
zstd: drop libatomic workaround for riscv
NickCao Dec 16, 2023
9eaa23a
glslang: drop libatomic workaround for riscv
NickCao Dec 16, 2023
dbb7b67
aws-sdk-cpp: drop libatomic workaround for riscv
NickCao Dec 16, 2023
8b2757a
cmake: drop libatomic workaround for riscv
NickCao Dec 16, 2023
945e8a2
libjxl: drop libatomic workaround for riscv
NickCao Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pkgs/by-name/cm/cmake/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ stdenv.mkDerivation (finalAttrs: {
"CFLAGS=-D_FILE_OFFSET_BITS=64"
"CXXFLAGS=-D_FILE_OFFSET_BITS=64"
]
# Workaround missing atomic ops with gcc <13
++ lib.optional stdenv.hostPlatform.isRiscV "LDFLAGS=-latomic"
++ [
"--"
# We should set the proper `CMAKE_SYSTEM_NAME`.
Expand Down
3 changes: 0 additions & 3 deletions pkgs/development/compilers/glslang/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake python3 bison jq ];

# Workaround missing atomic ops with gcc <13
env.LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";

postPatch = ''
cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/libraries/aws-sdk-cpp/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ stdenv.mkDerivation rec {

# propagation is needed for Security.framework to be available when linking
propagatedBuildInputs = [ aws-crt-cpp ];
# Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";

cmakeFlags = [
"-DBUILD_DEPS=OFF"
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/libraries/libjxl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ stdenv.mkDerivation rec {
"-DJPEGXL_FORCE_NEON=ON"
];

LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
CXXFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-mfp16-format=ieee";

# FIXME x86_64-darwin:
Expand Down
2 changes: 0 additions & 2 deletions pkgs/os-specific/linux/numactl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
patchShebangs test
'';

LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";

# You probably shouldn't ever run these! They will reconfigure Linux
# NUMA settings, which on my build machine makes the rest of package
# building ~5% slower until reboot. Ugh!
Expand Down
1 change: 0 additions & 1 deletion pkgs/servers/sql/mariadb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ let
'';

CXXFLAGS = lib.optionalString stdenv.hostPlatform.isi686 "-fpermissive";
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
});
in
server // {
Expand Down
2 changes: 0 additions & 2 deletions pkgs/tools/compression/zstd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ stdenv.mkDerivation rec {
tests/playTests.sh
'';

LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";

cmakeFlags = lib.attrsets.mapAttrsToList
(name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") {
BUILD_SHARED = !static;
Expand Down