Skip to content

aaaaaaaaaaaa #4

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

Open
tesnos6921 wants to merge 3 commits into
base: nixos-unstable
Choose a base branch
from
Open

aaaaaaaaaaaa #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a27e79
aaaaaaaaaaaa
tesnos6921 Jul 30, 2024
f4c0af3
bbbbbbbbbb
tesnos6921 Jul 30, 2024
61b3c25
no arm sync
tesnos6921 Jul 31, 2024
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
10 changes: 10 additions & 0 deletions pkgs/development/compilers/llvm/18/compiler-rt/X86-support-extension.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ index 3a66dd9c3fb..7efc85d9f9f 100644
if (WIN32)
set(i386_SOURCES
${i386_SOURCES}
@@ -542,3 +542,2 @@ arm/chkstk.S
${arm_or_thumb2_base_SOURCES}
- ${arm_sync_SOURCES}
)
@@ -552,4 +552,3 @@ set(arm_SOURCES
${arm_or_thumb2_base_SOURCES}
- ${arm_sync_SOURCES}
${arm_EABI_SOURCES}
${arm_Thumb1_SOURCES}
)
@@ -723,6 +723,7 @@ else ()
endif()

Expand Down
7 changes: 5 additions & 2 deletions pkgs/development/compilers/llvm/common/compiler-rt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ let
cp -r ${monorepoSrc}/${baseName} "$out"
'' else src;

preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
preConfigure = ''
cmakeFlagsArray+=(-DCMAKE_ASM_FLAGS="--target=arm-linux-gnueabihf -march=armv6")
'' ++ lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';
in
Expand Down Expand Up @@ -80,6 +82,7 @@ stdenv.mkDerivation ({
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-DCOMPILER_RT_BUILD_BUILTINS=OFF
] ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
] ++ lib.optionals ((useLLVM || bareMetal || isMusl || isAarch64) && (lib.versions.major release_version == "13")) [
Expand All @@ -101,7 +104,7 @@ stdenv.mkDerivation ({
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ lib.optionals (bareMetal) [
Expand Down