Skip to content

Build LLVM compiler-rt by default for toolchain sanitizer support #716

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
merged 4 commits into from
Apr 18, 2021
Merged

Build LLVM compiler-rt by default for toolchain sanitizer support #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12f3615
Build compiler-rt by default for sanitizer support when using vcpkg c…
ekilmer Apr 16, 2021
9bf37d1
Only build compiler-rt on linux/osx
ekilmer Apr 16, 2021
ba6bdba
llvm-12 compiler-rt only on linux and macos
ekilmer Apr 16, 2021
00108cb
Fix compiler-rt for llvm-9 on newer glibc versions
ekilmer Apr 17, 2021
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: 1 addition & 1 deletion ports/llvm-10/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Version: 10.0.1
Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Supports: !uwp
Build-Depends: llvm-vcpkg-common
Build-Depends: llvm-vcpkg-common, llvm-10[core, compiler-rt] (linux|osx)
Default-Features: tools, clang, enable-rtti, enable-z3, enable-eh, enable-assertions, disable-abi-breaking-checks, disable-terminfo, libcxx, libcxxabi, target-aarch64, target-arm, target-nvptx, target-sparc, target-x86

Feature: tools
Expand Down
2 changes: 1 addition & 1 deletion ports/llvm-11/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Version: 11.0.1
Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Supports: !uwp
Build-Depends: llvm-vcpkg-common
Build-Depends: llvm-vcpkg-common, llvm-11[core, compiler-rt] (linux|osx)
Default-Features: tools, clang, enable-rtti, enable-z3, enable-eh, enable-assertions, disable-abi-breaking-checks, disable-terminfo, libcxx, libcxxabi, target-aarch64, target-arm, target-nvptx, target-sparc, target-x86

Feature: tools
Expand Down
2 changes: 1 addition & 1 deletion ports/llvm-12/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Version: 12.0.0
Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Supports: !uwp
Build-Depends: llvm-vcpkg-common
Build-Depends: llvm-vcpkg-common, llvm-12[core, compiler-rt] (linux|osx)
Default-Features: tools, clang, enable-rtti, enable-z3, enable-eh, enable-assertions, disable-abi-breaking-checks, disable-terminfo, libcxx, libcxxabi, target-aarch64, target-arm, target-nvptx, target-sparc, target-x86

Feature: tools
Expand Down
35 changes: 35 additions & 0 deletions ports/llvm-9/0010-compiler-rt-glibc-2.31.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -1126,8 +1126,9 @@
CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
+ on many architectures. */
CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
#endif

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -214,15 +214,8 @@
unsigned short __seq;
unsigned long long __unused1;
unsigned long long __unused2;
-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
- unsigned int mode;
- unsigned short __seq;
- unsigned short __pad1;
- unsigned long __unused1;
- unsigned long __unused2;
#else
- unsigned short mode;
- unsigned short __pad1;
+ unsigned int mode;
unsigned short __seq;
unsigned short __pad2;
#if defined(__x86_64__) && !defined(_LP64)
2 changes: 1 addition & 1 deletion ports/llvm-9/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Port-Version: 1
Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Supports: !uwp
Build-Depends: llvm-vcpkg-common
Build-Depends: llvm-vcpkg-common, llvm-9[core, compiler-rt] (linux|osx)
Default-Features: tools, clang, enable-rtti, enable-z3, enable-eh, enable-assertions, disable-abi-breaking-checks, disable-terminfo, libcxx, libcxxabi, target-aarch64, target-arm, target-nvptx, target-sparc, target-x86

Feature: tools
Expand Down
1 change: 1 addition & 0 deletions ports/llvm-9/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ vcpkg_from_github(
0007-remove-FindZ3.cmake.patch
0008-fix-FindZ3.cmake.patch
0009-clang-sys-include-dir-path.patch
0010-compiler-rt-glibc-2.31.patch
0020-fix-vs2019-v16.6.patch
)

Expand Down