From e78678d24104d292bfae754cbe3c27c7c6f3822b Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Thu, 27 Apr 2023 19:07:28 +0000 Subject: [PATCH 1/4] Use old LLVM 16 mariner images --- .../common/templates/pipeline-with-resources.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index b1fd450a58d44..7f6607792a3a3 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -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-20230414005501-ac313ee env: ROOTFS_DIR: /crossrootfs/arm @@ -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-20230414005501-ac313ee 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-20230414005501-ac313ee 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-20230414005501-ac313ee 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-20230414005501-ac313ee env: ROOTFS_DIR: /crossrootfs/arm64 # This container contains all required toolsets to build for Android and for Linux with bionic libc. @@ -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-20230414005501-ac313ee 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-20230414005501-ac313ee env: ROOTFS_DIR: /crossrootfs/x86 From 9c4b94fff6fe3bc899f7d1a2d4388be2d33bde6d Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Thu, 27 Apr 2023 19:07:40 +0000 Subject: [PATCH 2/4] Fix build break due to new error --- .../pal/src/eventprovider/lttngprovider/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt b/src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt index 4b7337f6e7008..189b0bb7bc430 100644 --- a/src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt +++ b/src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt @@ -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) From d0d5cae1dfddf3f7dbc37652daf061d0bdda059a Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 5 May 2023 18:56:02 +0000 Subject: [PATCH 3/4] Use latest tags (which have llvm 16) --- .../common/templates/pipeline-with-resources.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index b27fd915922ae..e9b6e503a94ce 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -5,7 +5,7 @@ parameters: resources: containers: - container: linux_arm - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-20230414005501-ac313ee + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm env: ROOTFS_DIR: /crossrootfs/arm @@ -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-20230414005501-ac313ee + 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-20230414005501-ac313ee + 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-20230414005501-ac313ee + 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-20230414005501-ac313ee + 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. @@ -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-20230414005501-ac313ee + 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-20230414005501-ac313ee + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-x86 env: ROOTFS_DIR: /crossrootfs/x86 From 9bd903fc128e5a7a6dcd9246430e48126990120e Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Tue, 9 May 2023 17:12:09 +0000 Subject: [PATCH 4/4] Adjust wording --- src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt b/src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt index 189b0bb7bc430..715718bad4bca 100644 --- a/src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt +++ b/src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt @@ -62,7 +62,7 @@ add_dependencies(coreclrtraceptprovider generated_eventing_headers) find_library(LTTNG NAMES lttng-ust) -# --noinhibit-exec works around error in lld from LLVM 16 +# --noinhibit-exec works around error produced by 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