diff options
| author | Caroline Tice <cmtice@google.com> | 2019-10-29 13:21:19 -0700 |
|---|---|---|
| committer | Caroline Tice <cmtice@chromium.org> | 2019-10-31 21:33:21 +0000 |
| commit | b922860193acc4c2f5c9ae28e29f0f33deffcd1b (patch) | |
| tree | 37d3006162d6b88b41b45ac757cb4c68b01d8977 /compiler_wrapper/config.go | |
| parent | 03234661857747f86e135140c7a92f57561db36d (diff) | |
| download | toolchain-utils-b922860193acc4c2f5c9ae28e29f0f33deffcd1b.tar.gz | |
toolchain_utils: Upgrade compiler wrapper for llvm r370808.
BUG=chromium:1001317
TEST=In progress
Change-Id: I78481d2ca3f555d670e7e5972e547f94d2be22a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1888745
Reviewed-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Tobias Bosch <tbosch@google.com>
Commit-Queue: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Diffstat (limited to 'compiler_wrapper/config.go')
| -rw-r--r-- | compiler_wrapper/config.go | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go index 9b531e93..3e446201 100644 --- a/compiler_wrapper/config.go +++ b/compiler_wrapper/config.go @@ -91,23 +91,16 @@ func getConfig(configName string, useCCache bool, useLlvmNext bool, oldWrapperPa cfg.useCCache = useCCache if useLlvmNext { cfg.clangFlags = append(cfg.clangFlags, llvmNextFlags...) - cfg.clangPostFlags = append(cfg.clangPostFlags, llvmNextPostFlags...) } cfg.oldWrapperPath = oldWrapperPath cfg.version = version return &cfg, nil } -var llvmNextFlags = []string{ - "-Wno-reorder-init-list", - "-Wno-final-dtor-non-final-class", - "-Wno-return-stack-address", - "-Werror=poison-system-directories", -} +// TODO: Enable test in config_test.go, once we have new llvm-next flags. +var llvmNextFlags = []string{} -var llvmNextPostFlags = []string{ - "-Wno-implicit-int-float-conversion", -} +var llvmNextPostFlags = []string{} // Full hardening. // Temporarily disable function splitting because of chromium:434751. @@ -139,6 +132,13 @@ var crosHardenedConfig = &config{ "-Wno-section", "-static-libgcc", "-fuse-ld=lld", + "-Wno-reorder-init-list", + "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", + "-Werror=poison-system-directories", + }, + clangPostFlags: []string{ + "-Wno-implicit-int-float-conversion", }, newWarningsDir: "/tmp/fatal_clang_warnings", } @@ -163,6 +163,13 @@ var crosNonHardenedConfig = &config{ "-Wno-unknown-warning-option", "-Wno-section", "-static-libgcc", + "-Wno-reorder-init-list", + "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", + "-Werror=poison-system-directories", + }, + clangPostFlags: []string{ + "-Wno-implicit-int-float-conversion", }, newWarningsDir: "/tmp/fatal_clang_warnings", } @@ -188,8 +195,15 @@ var crosHostConfig = &config{ "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", + "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", + "-Werror=poison-system-directories", "-Wno-unknown-warning-option", }, + clangPostFlags: []string{ + "-Wno-implicit-int-float-conversion", + }, newWarningsDir: "/tmp/fatal_clang_warnings", } |