diff options
| author | 2017-11-06 20:28:23 +0000 | |
|---|---|---|
| committer | 2017-11-06 20:28:23 +0000 | |
| commit | 9c7dcfd72c644d7ed41fba79accf13d8e6c8be2a (patch) | |
| tree | b1413cbe68538d0a389e4125a3562b51d39a19bf | |
| parent | 048bf57c33bf433fe403b9eb30159951a03d3663 (diff) | |
| parent | bdb17f068c35c48370f3c3b7a564128d66c466ff (diff) | |
Merge "Remove CFI-related WARs that seem no longer necessary"
| -rw-r--r-- | cc/sanitize.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go index 9e1f02f7c..5d7f617e4 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -34,9 +34,8 @@ var ( cfiCflags = []string{"-flto", "-fsanitize-cfi-cross-dso", "-fsanitize-blacklist=external/compiler-rt/lib/cfi/cfi_blacklist.txt"} - // FIXME: revert the __cfi_check flag when clang is updated to r280031. cfiLdflags = []string{"-flto", "-fsanitize-cfi-cross-dso", "-fsanitize=cfi", - "-Wl,-plugin-opt,O1 -Wl,-export-dynamic-symbol=__cfi_check"} + "-Wl,-plugin-opt,O1"} cfiArflags = []string{"--plugin ${config.ClangBin}/../lib64/LLVMgold.so"} cfiExportsMapPath = "build/soong/cc/config/cfi_exports.map" cfiExportsMap android.Path @@ -364,9 +363,6 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { // __cfi_check needs to be built as Thumb (see the code in linker_cfi.cpp). LLVM is not set up // to do this on a function basis, so force Thumb on the entire module. flags.RequiredInstructionSet = "thumb" - // Workaround for b/33678192. CFI jumptables need Thumb2 codegen. Revert when - // Clang is updated past r290384. - flags.LdFlags = append(flags.LdFlags, "-march=armv7-a") } sanitizers = append(sanitizers, "cfi") |