Skip to content
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

Jump to bottom

Update mariner images to latest with LLVM 16 #84676

Merged
merged 6 commits into from
May 10, 2023
Merged

Update mariner images to latest with LLVM 16 #84676

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e78678d
Use old LLVM 16 mariner images
sbomer Apr 27, 2023
9c4b94f
Fix build break due to new error
sbomer Apr 27, 2023
3bad664
Merge remote-tracking branch 'origin/main' into marinerLLVM16
sbomer May 5, 2023
d0d5cae
Use latest tags (which have llvm 16)
sbomer May 5, 2023
77be469
Merge remote-tracking branch 'origin/main' into marinerLLVM16
sbomer May 5, 2023
9bd903f
Adjust wording
sbomer May 9, 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
14 changes: 7 additions & 7 deletions eng/pipelines/common/templates/pipeline-with-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ parameters:
resources:
containers:
- container: linux_arm
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-20230414190614-8100bf7
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
env:
ROOTFS_DIR: /crossrootfs/arm

Expand All @@ -15,22 +15,22 @@ resources:
ROOTFS_DIR: /crossrootfs/armv6

- container: linux_arm64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-20230414190614-8100bf7
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
env:
ROOTFS_DIR: /crossrootfs/arm64

- container: linux_musl_x64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-alpine-20230414190614-8100bf7
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-alpine
env:
ROOTFS_DIR: /crossrootfs/x64

- container: linux_musl_arm
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine-20230414190614-8100bf7
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
env:
ROOTFS_DIR: /crossrootfs/arm

- container: linux_musl_arm64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine-20230414190614-8100bf7
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
env:
ROOTFS_DIR: /crossrootfs/arm64
# This container contains all required toolsets to build for Android and for Linux with bionic libc.
Expand All @@ -39,12 +39,12 @@ resources:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-android

- container: linux_x64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-20230414190614-8100bf7
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64
env:
ROOTFS_DIR: /crossrootfs/x64

- container: linux_x86
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-x86-20230414190614-8100bf7
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-x86
env:
ROOTFS_DIR: /crossrootfs/x86

Expand Down
5 changes: 5 additions & 0 deletions src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,14 @@ add_dependencies(coreclrtraceptprovider generated_eventing_headers)

find_library(LTTNG NAMES lttng-ust)

# --noinhibit-exec works around error in lld from LLVM 16
# that is caused by invalid symbols in the lttng we are linking against:
# ld.lld: error: liblttng-ust.so: invalid local symbol '__stop___tracepoints_ptrs' in global part of symbol table
# see https://github.com/llvm/llvm-project/commit/3ac94280245415be66cb1b603367c5f4f6d498e7
target_link_libraries(coreclrtraceptprovider
PRIVATE
${LTTNG}
-Wl,--noinhibit-exec
)

set_target_properties(coreclrtraceptprovider PROPERTIES LINKER_LANGUAGE CXX)
Expand Down