-
Notifications
You must be signed in to change notification settings - Fork 103
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade mariner images to LLVM 16 (#864)
- Loading branch information
Showing
11 changed files
with
96 additions
and
84 deletions.
There are no files selected for viewing
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
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
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
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 |
|---|---|---|
| @@ -1,45 +1,46 @@ | ||
| FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-builder-local AS builder | ||
| ARG ROOTFS_DIR=/crossrootfs/arm | ||
|
|
||
| RUN tdnf install -y debootstrap | ||
|
|
||
| RUN /scripts/eng/common/cross/build-rootfs.sh arm xenial --skipunmount | ||
|
|
||
| # Build compiler-rt profile library for PGO instrumentation | ||
| RUN mkdir compiler-rt_build && cd compiler-rt_build && \ | ||
| BUILD_FLAGS="-v --sysroot=$ROOTFS_DIR" \ | ||
| TARGET_TRIPLE=arm-linux-gnueabihf && \ | ||
| TARGET_TRIPLE="arm-linux-gnueabihf" && \ | ||
| cmake ../llvm-project.src/compiler-rt \ | ||
| -DCOMPILER_RT_BUILD_PROFILE=ON \ | ||
| -DCOMPILER_RT_BUILD_BUILTINS=OFF \ | ||
| -DCOMPILER_RT_BUILD_SANITIZERS=ON \ | ||
| -DCOMPILER_RT_BUILD_XRAY=OFF \ | ||
| -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \ | ||
| \ | ||
| -DCOMPILER_RT_BUILD_BUILTINS=OFF \ | ||
| -DCOMPILER_RT_BUILD_CRT=OFF \ | ||
| -DCOMPILER_RT_BUILD_GWP_ASAN=OFF \ | ||
| -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ | ||
| -DCOMPILER_RT_BUILD_MEMPROF=OFF \ | ||
| -DCOMPILER_RT_BUILD_ORC=OFF \ | ||
| -DCOMPILER_RT_BUILD_XRAY=OFF \ | ||
| \ | ||
| -DCMAKE_C_COMPILER=clang \ | ||
| -DCMAKE_BUILD_TYPE=Release \ | ||
| -DCMAKE_ASM_COMPILER=clang \ | ||
| -DCMAKE_C_COMPILER=clang \ | ||
| -DCMAKE_CXX_COMPILER=clang++ \ | ||
| -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld" \ | ||
| -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" \ | ||
| -DCMAKE_ASM_COMPILER_TARGET=${TARGET_TRIPLE} \ | ||
| -DCMAKE_C_COMPILER_TARGET=${TARGET_TRIPLE} \ | ||
| -DCMAKE_CXX_COMPILER_TARGET=${TARGET_TRIPLE} \ | ||
| -DLLVM_CONFIG_PATH=llvm-config \ | ||
| -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \ | ||
| -DCMAKE_BUILD_TYPE=Release \ | ||
| -DCMAKE_INSTALL_PREFIX=$ROOTFS_DIR/usr \ | ||
| -DCMAKE_ASM_COMPILER_TARGET="${TARGET_TRIPLE}" \ | ||
| -DCMAKE_C_COMPILER_TARGET="${TARGET_TRIPLE}" \ | ||
| -DCMAKE_CXX_COMPILER_TARGET="${TARGET_TRIPLE}" \ | ||
| -DCMAKE_ASM_FLAGS="${BUILD_FLAGS}" \ | ||
| -DCMAKE_C_FLAGS="${BUILD_FLAGS}" \ | ||
| -DCMAKE_CXX_FLAGS="${BUILD_FLAGS}" && \ | ||
| make -j $(getconf _NPROCESSORS_ONLN) | ||
|
|
||
| RUN LLVM_VERSION=12.0.1 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \ | ||
| RUN LLVM_VERSION=16.0.0 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \ | ||
| mkdir -p $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \ | ||
| cp compiler-rt_build/lib/linux/libclang_rt.*-armhf.a $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \ | ||
| cp -r compiler-rt_build/include/sanitizer $ROOTFS_DIR/usr/include | ||
|
|
||
|
|
||
| FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-arm-local | ||
| FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm-local | ||
| ARG ROOTFS_DIR=/crossrootfs/arm | ||
|
|
||
| COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR |
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
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
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 |
|---|---|---|
| @@ -1,47 +1,46 @@ | ||
| FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-builder-local AS builder | ||
| ARG ROOTFS_DIR=/crossrootfs/x86 | ||
|
|
||
| # Provides LLVMConfig.cmake, needed to build compiler-rt. Only needed on x86. | ||
| # x64 doesn't need this because we use compiler-rt from the mariner package. | ||
| # arm/arm64 don't need this because LLVMConfig.cmake is provided by the LLVM we build from source. | ||
| RUN tdnf install -y llvm-devel | ||
|
|
||
| RUN /scripts/eng/common/cross/build-rootfs.sh x86 xenial --skipunmount | ||
|
|
||
| # Build compiler-rt profile library for PGO instrumentation | ||
| RUN mkdir compiler-rt_build && cd compiler-rt_build && \ | ||
| BUILD_FLAGS="-v --sysroot=$ROOTFS_DIR" \ | ||
| TARGET_TRIPLE=i386-linux-gnu && \ | ||
| TARGET_TRIPLE="i386-linux-gnu" && \ | ||
| cmake ../llvm-project.src/compiler-rt \ | ||
| -DCOMPILER_RT_BUILD_PROFILE=ON \ | ||
| -DCOMPILER_RT_BUILD_BUILTINS=OFF \ | ||
| -DCOMPILER_RT_BUILD_SANITIZERS=ON \ | ||
| -DCOMPILER_RT_BUILD_XRAY=OFF \ | ||
| -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \ | ||
| \ | ||
| -DCOMPILER_RT_BUILD_BUILTINS=OFF \ | ||
| -DCOMPILER_RT_BUILD_CRT=OFF \ | ||
| -DCOMPILER_RT_BUILD_GWP_ASAN=OFF \ | ||
| -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ | ||
| -DCOMPILER_RT_BUILD_MEMPROF=OFF \ | ||
| -DCOMPILER_RT_BUILD_ORC=OFF \ | ||
| -DCOMPILER_RT_BUILD_XRAY=OFF \ | ||
| \ | ||
| -DCMAKE_C_COMPILER=clang \ | ||
| -DCMAKE_BUILD_TYPE=Release \ | ||
| -DCMAKE_ASM_COMPILER=clang \ | ||
| -DCMAKE_C_COMPILER=clang \ | ||
| -DCMAKE_CXX_COMPILER=clang++ \ | ||
| -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld" \ | ||
| -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" \ | ||
| -DCMAKE_ASM_COMPILER_TARGET=${TARGET_TRIPLE} \ | ||
| -DCMAKE_C_COMPILER_TARGET=${TARGET_TRIPLE} \ | ||
| -DCMAKE_CXX_COMPILER_TARGET=${TARGET_TRIPLE} \ | ||
| -DLLVM_CONFIG_PATH=llvm-config \ | ||
| -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \ | ||
| -DCMAKE_BUILD_TYPE=Release \ | ||
| -DCMAKE_INSTALL_PREFIX=$ROOTFS_DIR/usr \ | ||
| -DCMAKE_ASM_COMPILER_TARGET="${TARGET_TRIPLE}" \ | ||
| -DCMAKE_C_COMPILER_TARGET="${TARGET_TRIPLE}" \ | ||
| -DCMAKE_CXX_COMPILER_TARGET="${TARGET_TRIPLE}" \ | ||
| -DCMAKE_ASM_FLAGS="${BUILD_FLAGS}" \ | ||
| -DCMAKE_C_FLAGS="${BUILD_FLAGS}" \ | ||
| -DCMAKE_CXX_FLAGS="${BUILD_FLAGS}" && \ | ||
| make -j $(getconf _NPROCESSORS_ONLN) | ||
|
|
||
| RUN LLVM_VERSION=12.0.1 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \ | ||
| RUN LLVM_VERSION=16.0.0 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \ | ||
| mkdir -p $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \ | ||
| cp compiler-rt_build/lib/linux/libclang_rt.*-i386.a $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \ | ||
| cp -r compiler-rt_build/include/sanitizer $ROOTFS_DIR/usr/include | ||
|
|
||
|
|
||
| FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-amd64-local | ||
| FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm-local | ||
| ARG ROOTFS_DIR=/crossrootfs/x86 | ||
|
|
||
| COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR |
This file was deleted.
Oops, something went wrong.
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
File renamed without changes.
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