Revert "Update clang to upstream chromium m114's clang-17 (#2680)"

This reverts commit 92151b6.
youtube · Mar 28, 2024 · 2ea2798 · 2ea2798
1 parent 92151b6
commit 2ea2798
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 31 deletions.
diff --git 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}
-      - COBALT_CLANG_VER=${COBALT_CLANG_VER:-17-init-8029-g27f27d15-3}
+      - CLANG_16_VER=${CLANG_16_VER:-16-init-17653-g39da55e8-2}
   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}
-        - COBALT_CLANG_VER=${COBALT_CLANG_VER:-17-init-8029-g27f27d15-3}
+        - CLANG_16_VER=${CLANG_16_VER:-16-init-17653-g39da55e8-2}
     image: cobalt-build-base
     depends_on:
       - base
@@ -125,7 +125,7 @@ services:
       args:
         - FROM_IMAGE=base-bionic
         - CLANG_VER=${CLANG_VER:-365097-f7e52fbd-8}
-        - COBALT_CLANG_VER=${COBALT_CLANG_VER:-17-init-8029-g27f27d15-3}
+        - CLANG_16_VER=${CLANG_16_VER:-16-init-17653-g39da55e8-2}
     image: build-base-bionic
     depends_on:
       - base-bionic

diff --git 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 toolchain for all Linux-hosted builds
-ARG COBALT_CLANG_VER
+# === Install Clang 16 toolchain for all Linux-hosted builds
+ARG CLANG_16_VER
 
-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
+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
 
 RUN cd /tmp \
-    && mkdir -p ${COBALT_CLANG_TC_HOME} \
+    && mkdir -p ${CLANG_16_TC_HOME} \
     && curl --silent -O -J \
-        ${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
+        ${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
 
 RUN git config --global --add safe.directory /code
 

diff --git 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 toolchain for llvm-symbolization.
-ARG COBALT_CLANG_VER
+# === Install Clang 16 toolchain for llvm-symbolization.
+ARG CLANG_16_VER
 
-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
+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
 
 RUN cd /tmp \
-    && mkdir -p ${COBALT_CLANG_TC_HOME} \
+    && mkdir -p ${CLANG_16_TC_HOME} \
     && curl --silent -O -J \
-        ${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
+        ${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
 
-# === Install Clang toolchain coverage tools.
+# === Install Clang 16 toolchain coverage tools.
 RUN cd /tmp \
-    && mkdir -p ${COBALT_CLANG_TC_HOME} \
+    && mkdir -p ${CLANG_16_TC_HOME} \
     && curl --silent -O -J \
-        ${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
+        ${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
 
 WORKDIR /out
 # Sets the locale in the environment. This is needed for NPLB unit tests.

diff --git a/starboard/build/clang.py b/starboard/build/clang.py
@@ -18,4 +18,4 @@
 
 def GetClangSpecification():
   """Gets the ClangSpecification instance for this project."""
-  return ClangSpecification('17-init-8029-g27f27d15-3', '17.0.0')
+  return ClangSpecification('16-init-17653-g39da55e8-2', '16.0.0')
diff --git a/starboard/build/config/clang.gni b/starboard/build/config/clang.gni
@@ -15,7 +15,7 @@
 import("//starboard/build/toolchain/starboard_toolchains.gni")
 
 declare_args() {
-  clang_revision = "17-init-8029-g27f27d15-3"
+  clang_revision = "16-init-17653-g39da55e8-2"
 }
 
 default_clang_base_path = "$starboard_toolchains_path/x86_64-linux-gnu-clang-chromium-${clang_revision}"

diff --git 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 is resolved.
+  // with AddressSanitizerFlags in Clang 16 is resolved.
   return "detect_stack_use_after_return=0:external_symbolizer_"
          "path=" ASAN_SYMBOLIZER_PATH;
 }

diff --git a/starboard/tools/download_clang.sh b/starboard/tools/download_clang.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-CLANG_VERSION="${1:-17-init-8029-g27f27d15-3}"
+CLANG_VERSION="${1:-16-init-17653-g39da55e8-2}"
 TOOLCHAIN_ROOT="${HOME}/starboard-toolchains/"
 TOOLCHAIN_HOME="${TOOLCHAIN_ROOT}/x86_64-linux-gnu-clang-chromium-${CLANG_VERSION}"