Commit d0d368ce authored by Sadrul Chowdhury's avatar Sadrul Chowdhury Committed by Commit Bot

Revert "Roll clang n332890-c2443155-1 : n333938-3a6da112-1."

This reverts commit b21c79dc.

Reason for revert: Broke build on chromeos: https://ci.chromium.org/p/chromium/builders/ci/chromeos-amd64-generic-cfi-thin-lto-rel/15413

Original change's description:
> Roll clang n332890-c2443155-1 : n333938-3a6da112-1.
> 
> Ran `./tools/clang/scripts/upload_revision.py 3a6da1122b990386edeba0987d0d1fdc9c8dc53d`.
> 
> Bug: 1030664
> Change-Id: I229bf8fd0d65fcacdab5f002220d1350b38aedb6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1966387
> Auto-Submit: Reid Kleckner <rnk@chromium.org>
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#727069}

TBR=thakis@chromium.org,ukai@chromium.org,hans@chromium.org,rnk@chromium.org

Change-Id: I2736079e5922fb9b182e952d233d5020ec15eef1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1030664
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1979042Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727070}
parent b21c79dc
...@@ -632,12 +632,14 @@ config("compiler") { ...@@ -632,12 +632,14 @@ config("compiler") {
] ]
} }
# Disable TypePromotion to see if that fixes the ToT bots. if (llvm_force_head_revision) {
# TODO(crbug.com/1033863): Get this fixed upstream. # Disable TypePromotion to see if that fixes the ToT bots.
ldflags += [ # TODO(crbug.com/1033863): Get this fixed upstream.
"-Wl,-mllvm", ldflags += [
"-Wl,-disable-type-promotion=true", "-Wl,-mllvm",
] "-Wl,-disable-type-promotion=true",
]
}
} else { } else {
ldflags += [ "-Wl,-plugin-opt,jobs=" + max_jobs_per_link ] ldflags += [ "-Wl,-plugin-opt,jobs=" + max_jobs_per_link ]
} }
...@@ -1534,9 +1536,6 @@ config("default_warnings") { ...@@ -1534,9 +1536,6 @@ config("default_warnings") {
# TODO(https://crbug.com/1028110): Evaluate and possible enable. # TODO(https://crbug.com/1028110): Evaluate and possible enable.
"-Wno-deprecated-copy", "-Wno-deprecated-copy",
# TODO(https://crbug.com/1031169): Clean up and enable.
"-Wno-misleading-indentation",
] ]
if (is_win) { if (is_win) {
...@@ -1550,6 +1549,13 @@ config("default_warnings") { ...@@ -1550,6 +1549,13 @@ config("default_warnings") {
# TODO(https://crbug.com/995993): Clean up and enable. # TODO(https://crbug.com/995993): Clean up and enable.
"-Wno-implicit-fallthrough", "-Wno-implicit-fallthrough",
] ]
if (llvm_force_head_revision) {
cflags += [
# TODO(https://crbug.com/1031169): Clean up and enable.
"-Wno-misleading-indentation",
]
}
} }
} }
} }
......
...@@ -39,8 +39,8 @@ import zipfile ...@@ -39,8 +39,8 @@ import zipfile
# Do NOT CHANGE this if you don't know what you're doing -- see # Do NOT CHANGE this if you don't know what you're doing -- see
# https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md # https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
# Reverting problematic clang rolls is safe, though. # Reverting problematic clang rolls is safe, though.
CLANG_REVISION = '3a6da1122b990386edeba0987d0d1fdc9c8dc53d' CLANG_REVISION = 'c2443155a0fb245c8f17f2c1c72b6ea391e86e81'
CLANG_SVN_REVISION = 'n333938' CLANG_SVN_REVISION = 'n332890'
CLANG_SUB_REVISION = 1 CLANG_SUB_REVISION = 1
PACKAGE_VERSION = '%s-%s-%s' % (CLANG_SVN_REVISION, CLANG_REVISION[:8], PACKAGE_VERSION = '%s-%s-%s' % (CLANG_SVN_REVISION, CLANG_REVISION[:8],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment