From c7186e4e309e7c9dc7aa2c3d3db9e6c40fd7adbf Mon Sep 17 00:00:00 2001 From: Niranjan YArdi Date: Sat, 23 Mar 2024 12:12:06 -0700 Subject: [PATCH] Rename CLANG_17 to COBALT_CLANG Change-Id: I1038f7d435660ad39036b177f375ed3d9529562b --- docker-compose.yml | 6 ++--- docker/linux/base/build/Dockerfile | 18 ++++++------- docker/linux/unittest/Dockerfile | 30 ++++++++++----------- starboard/linux/x64x11/sanitizer_options.cc | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3f13604fc9f3..ea3a5fab2bbf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,7 +49,7 @@ x-shared-unittest-definitions: &shared-unittest-definitions dockerfile: unittest/Dockerfile args: - CLANG_VER=${CLANG_VER:-365097-f7e52fbd-8} - - CLANG_17_VER=${CLANG_17_VER:-17-init-8029-g27f27d15-3} + - COBALT_CLANG_VER=${COBALT_CLANG_VER:-17-init-8029-g27f27d15-3} image: cobalt-linux-x64x11-unittest environment: - PLATFORM=${PLATFORM:-linux-x64x11} @@ -112,7 +112,7 @@ services: args: # Should match version pinned by Starboard - CLANG_VER=${CLANG_VER:-365097-f7e52fbd-8} - - CLANG_17_VER=${CLANG_17_VER:-17-init-8029-g27f27d15-3} + - COBALT_CLANG_VER=${COBALT_CLANG_VER:-17-init-8029-g27f27d15-3} image: cobalt-build-base depends_on: - base @@ -125,7 +125,7 @@ services: args: - FROM_IMAGE=base-bionic - CLANG_VER=${CLANG_VER:-365097-f7e52fbd-8} - - CLANG_17_VER=${CLANG_17_VER:-17-init-8029-g27f27d15-3} + - COBALT_CLANG_VER=${COBALT_CLANG_VER:-17-init-8029-g27f27d15-3} image: build-base-bionic depends_on: - base-bionic diff --git a/docker/linux/base/build/Dockerfile b/docker/linux/base/build/Dockerfile index 88375cc3381a..8f08f7bc5a87 100644 --- a/docker/linux/base/build/Dockerfile +++ b/docker/linux/base/build/Dockerfile @@ -97,19 +97,19 @@ RUN cd /tmp \ && echo ${CLANG_VER} >> ${TC_HOME}/cr_build_revision \ && rm clang-${CLANG_VER}.tgz -# === Install Clang 16 toolchain for all Linux-hosted builds -ARG CLANG_17_VER +# === Install Clang toolchain for all Linux-hosted builds +ARG COBALT_CLANG_VER -ARG CLANG_17_TC_HOME=${TC_ROOT}/x86_64-linux-gnu-clang-chromium-${CLANG_17_VER} -ARG CLANG_17_BASE_URL=https://commondatastorage.googleapis.com/chromium-browser-clang +ARG COBALT_CLANG_TC_HOME=${TC_ROOT}/x86_64-linux-gnu-clang-chromium-${COBALT_CLANG_VER} +ARG COBALT_CLANG_BASE_URL=https://commondatastorage.googleapis.com/chromium-browser-clang RUN cd /tmp \ - && mkdir -p ${CLANG_17_TC_HOME} \ + && mkdir -p ${COBALT_CLANG_TC_HOME} \ && curl --silent -O -J \ - ${CLANG_17_BASE_URL}/Linux_x64/clang-llvmorg-${CLANG_17_VER}.tgz \ - && tar xf clang-llvmorg-${CLANG_17_VER}.tgz -C ${CLANG_17_TC_HOME} \ - && echo ${CLANG_17_VER} >> ${CLANG_17_TC_HOME}/cr_build_revision \ - && rm clang-llvmorg-${CLANG_17_VER}.tgz + ${COBALT_CLANG_BASE_URL}/Linux_x64/clang-llvmorg-${COBALT_CLANG_VER}.tgz \ + && tar xf clang-llvmorg-${COBALT_CLANG_VER}.tgz -C ${COBALT_CLANG_TC_HOME} \ + && echo ${COBALT_CLANG_VER} >> ${COBALT_CLANG_TC_HOME}/cr_build_revision \ + && rm clang-llvmorg-${COBALT_CLANG_VER}.tgz RUN git config --global --add safe.directory /code diff --git a/docker/linux/unittest/Dockerfile b/docker/linux/unittest/Dockerfile index c4f63e8037ad..eaa110cc82cc 100644 --- a/docker/linux/unittest/Dockerfile +++ b/docker/linux/unittest/Dockerfile @@ -64,28 +64,28 @@ RUN cd /tmp \ && echo ${CLANG_VER} >> ${TC_HOME}/cr_build_revision \ && rm clang-${CLANG_VER}.tgz -# === Install Clang 16 toolchain for llvm-symbolization. -ARG CLANG_17_VER +# === Install Clang toolchain for llvm-symbolization. +ARG COBALT_CLANG_VER -ARG CLANG_17_TC_HOME=${TC_ROOT}/x86_64-linux-gnu-clang-chromium-${CLANG_17_VER} -ARG CLANG_17_BASE_URL=https://commondatastorage.googleapis.com/chromium-browser-clang +ARG COBALT_CLANG_TC_HOME=${TC_ROOT}/x86_64-linux-gnu-clang-chromium-${COBALT_CLANG_VER} +ARG COBALT_CLANG_BASE_URL=https://commondatastorage.googleapis.com/chromium-browser-clang RUN cd /tmp \ - && mkdir -p ${CLANG_17_TC_HOME} \ + && mkdir -p ${COBALT_CLANG_TC_HOME} \ && curl --silent -O -J \ - ${CLANG_17_BASE_URL}/Linux_x64/clang-llvmorg-${CLANG_17_VER}.tgz \ - && tar xf clang-llvmorg-${CLANG_17_VER}.tgz -C ${CLANG_17_TC_HOME} \ - && echo ${CLANG_17_VER} >> ${CLANG_17_TC_HOME}/cr_build_revision \ - && rm clang-llvmorg-${CLANG_17_VER}.tgz + ${COBALT_CLANG_BASE_URL}/Linux_x64/clang-llvmorg-${COBALT_CLANG_VER}.tgz \ + && tar xf clang-llvmorg-${COBALT_CLANG_VER}.tgz -C ${COBALT_CLANG_TC_HOME} \ + && echo ${COBALT_CLANG_VER} >> ${COBALT_CLANG_TC_HOME}/cr_build_revision \ + && rm clang-llvmorg-${COBALT_CLANG_VER}.tgz -# === Install Clang 16 toolchain coverage tools. +# === Install Clang toolchain coverage tools. RUN cd /tmp \ - && mkdir -p ${CLANG_17_TC_HOME} \ + && mkdir -p ${COBALT_CLANG_TC_HOME} \ && curl --silent -O -J \ - ${CLANG_17_BASE_URL}/Linux_x64/llvm-code-coverage-llvmorg-${CLANG_17_VER}.tgz \ - && tar xf llvm-code-coverage-llvmorg-${CLANG_17_VER}.tgz -C ${CLANG_17_TC_HOME} \ - && echo ${CLANG_17_VER} >> ${CLANG_17_TC_HOME}/cr_build_revision \ - && rm llvm-code-coverage-llvmorg-${CLANG_17_VER}.tgz + ${COBALT_CLANG_BASE_URL}/Linux_x64/llvm-code-coverage-llvmorg-${COBALT_CLANG_VER}.tgz \ + && tar xf llvm-code-coverage-llvmorg-${COBALT_CLANG_VER}.tgz -C ${COBALT_CLANG_TC_HOME} \ + && echo ${COBALT_CLANG_VER} >> ${COBALT_CLANG_TC_HOME}/cr_build_revision \ + && rm llvm-code-coverage-llvmorg-${COBALT_CLANG_VER}.tgz WORKDIR /out # Sets the locale in the environment. This is needed for NPLB unit tests. diff --git a/starboard/linux/x64x11/sanitizer_options.cc b/starboard/linux/x64x11/sanitizer_options.cc index f565defd7832..a9c5d69c9035 100644 --- a/starboard/linux/x64x11/sanitizer_options.cc +++ b/starboard/linux/x64x11/sanitizer_options.cc @@ -41,7 +41,7 @@ SANITIZER_HOOK_ATTRIBUTE const char* __lsan_default_suppressions() { #if defined(ASAN_SYMBOLIZER_PATH) extern "C" const char* __asan_default_options() { // TODO(b/278247547) : Remove detect_stack_use_after_return=0 once the issue - // with AddressSanitizerFlags in Clang 16 is resolved. + // with AddressSanitizerFlags in Clang is resolved. return "detect_stack_use_after_return=0:external_symbolizer_" "path=" ASAN_SYMBOLIZER_PATH; }