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 clang to upstream chromium m114's clang-17 #2680

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Update clang to upstream chromium m114's clang-17 #2680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88b8a04
Update clang to upstream chromium m114's clang-17
niranjanyardi Mar 22, 2024
c3c5032
Rename CLANG_17 to COBALT_CLANG
niranjanyardi Mar 23, 2024
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
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ x-shared-unittest-definitions: &shared-unittest-definitions
dockerfile: unittest/Dockerfile
args:
- CLANG_VER=${CLANG_VER:-365097-f7e52fbd-8}
- CLANG_16_VER=${CLANG_16_VER:-16-init-17653-g39da55e8-2}
- COBALT_CLANG_VER=${COBALT_CLANG_VER:-17-init-8029-g27f27d15-3}
image: cobalt-linux-x64x11-unittest
environment:
- PLATFORM=${PLATFORM:-linux-x64x11}
Expand Down Expand Up @@ -112,7 +112,7 @@ services:
args:
# Should match version pinned by Starboard
- CLANG_VER=${CLANG_VER:-365097-f7e52fbd-8}
- CLANG_16_VER=${CLANG_16_VER:-16-init-17653-g39da55e8-2}
- COBALT_CLANG_VER=${COBALT_CLANG_VER:-17-init-8029-g27f27d15-3}
image: cobalt-build-base
depends_on:
- base
Expand All @@ -125,7 +125,7 @@ services:
args:
- FROM_IMAGE=base-bionic
- CLANG_VER=${CLANG_VER:-365097-f7e52fbd-8}
- CLANG_16_VER=${CLANG_16_VER:-16-init-17653-g39da55e8-2}
- COBALT_CLANG_VER=${COBALT_CLANG_VER:-17-init-8029-g27f27d15-3}
image: build-base-bionic
depends_on:
- base-bionic
Expand Down
18 changes: 9 additions & 9 deletions docker/linux/base/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_16_VER
# === Install Clang toolchain for all Linux-hosted builds
ARG COBALT_CLANG_VER

ARG CLANG_16_TC_HOME=${TC_ROOT}/x86_64-linux-gnu-clang-chromium-${CLANG_16_VER}
ARG CLANG_16_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_16_TC_HOME} \
&& mkdir -p ${COBALT_CLANG_TC_HOME} \
&& curl --silent -O -J \
${CLANG_16_BASE_URL}/Linux_x64/clang-llvmorg-${CLANG_16_VER}.tgz \
&& tar xf clang-llvmorg-${CLANG_16_VER}.tgz -C ${CLANG_16_TC_HOME} \
&& echo ${CLANG_16_VER} >> ${CLANG_16_TC_HOME}/cr_build_revision \
&& rm clang-llvmorg-${CLANG_16_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

Expand Down
30 changes: 15 additions & 15 deletions docker/linux/unittest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_16_VER
# === Install Clang toolchain for llvm-symbolization.
ARG COBALT_CLANG_VER

ARG CLANG_16_TC_HOME=${TC_ROOT}/x86_64-linux-gnu-clang-chromium-${CLANG_16_VER}
ARG CLANG_16_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_16_TC_HOME} \
&& mkdir -p ${COBALT_CLANG_TC_HOME} \
&& curl --silent -O -J \
${CLANG_16_BASE_URL}/Linux_x64/clang-llvmorg-${CLANG_16_VER}.tgz \
&& tar xf clang-llvmorg-${CLANG_16_VER}.tgz -C ${CLANG_16_TC_HOME} \
&& echo ${CLANG_16_VER} >> ${CLANG_16_TC_HOME}/cr_build_revision \
&& rm clang-llvmorg-${CLANG_16_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_16_TC_HOME} \
&& mkdir -p ${COBALT_CLANG_TC_HOME} \
&& curl --silent -O -J \
${CLANG_16_BASE_URL}/Linux_x64/llvm-code-coverage-llvmorg-${CLANG_16_VER}.tgz \
&& tar xf llvm-code-coverage-llvmorg-${CLANG_16_VER}.tgz -C ${CLANG_16_TC_HOME} \
&& echo ${CLANG_16_VER} >> ${CLANG_16_TC_HOME}/cr_build_revision \
&& rm llvm-code-coverage-llvmorg-${CLANG_16_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.
Expand Down
2 changes: 1 addition & 1 deletion starboard/build/clang.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

def GetClangSpecification():
"""Gets the ClangSpecification instance for this project."""
return ClangSpecification('16-init-17653-g39da55e8-2', '16.0.0')
return ClangSpecification('17-init-8029-g27f27d15-3', '17.0.0')
2 changes: 1 addition & 1 deletion starboard/build/config/clang.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import("//starboard/build/toolchain/starboard_toolchains.gni")

declare_args() {
clang_revision = "16-init-17653-g39da55e8-2"
clang_revision = "17-init-8029-g27f27d15-3"
}

default_clang_base_path = "$starboard_toolchains_path/x86_64-linux-gnu-clang-chromium-${clang_revision}"
Expand Down
2 changes: 1 addition & 1 deletion starboard/linux/x64x11/sanitizer_options.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion starboard/tools/download_clang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -e

CLANG_VERSION="${1:-16-init-17653-g39da55e8-2}"
CLANG_VERSION="${1:-17-init-8029-g27f27d15-3}"
TOOLCHAIN_ROOT="${HOME}/starboard-toolchains/"
TOOLCHAIN_HOME="${TOOLCHAIN_ROOT}/x86_64-linux-gnu-clang-chromium-${CLANG_VERSION}"

Expand Down
Loading