forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
llvmPackages_11.compiler-rt: enable support for i486 i586 i686
compiler-rt (and as a result clang) can't be build for i686 (as noticed here: NixOS#99984). The patch adds the required variables and should result in the same behavior as in the nixpkgs-llvm10. It essentially forces to use i386 buildins when using i486, i586 or i686, which are not supported. Fixes NixOS#100392 (cherry picked from commit 6948875)
- Loading branch information
1 parent
b2b839a
commit bd49939
Showing
2 changed files
with
24 additions
and
0 deletions.
There are no files selected for viewing
23 changes: 23 additions & 0 deletions
23
pkgs/development/compilers/llvm/11/compiler-rt-X86-support-extension.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt | ||
index 3a66dd9c3fb..7efc85d9f9f 100644 | ||
--- a/lib/builtins/CMakeLists.txt | ||
+++ b/lib/builtins/CMakeLists.txt | ||
@@ -301,6 +301,10 @@ if (NOT MSVC) | ||
i386/umoddi3.S | ||
) | ||
|
||
+ set(i486_SOURCES ${i386_SOURCES}) | ||
+ set(i586_SOURCES ${i386_SOURCES}) | ||
+ set(i686_SOURCES ${i386_SOURCES}) | ||
+ | ||
if (WIN32) | ||
set(i386_SOURCES | ||
${i386_SOURCES} | ||
@@ -608,6 +612,7 @@ else () | ||
endif() | ||
|
||
foreach (arch ${BUILTIN_SUPPORTED_ARCH}) | ||
+ message("arch: ${arch}") | ||
if (CAN_TARGET_${arch}) | ||
# For ARM archs, exclude any VFP builtins if VFP is not supported | ||
if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters