diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-29 04:52:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-29 04:52:31 +0000 |
| commit | be6b6a63f85ab6a883a97bb393bcfbcd4e53a494 (patch) | |
| tree | 68c4488d1011ad46ed25a1472b5a79cbc1736dc3 /cc | |
| parent | 601ab89103e438cb957276d34775341eeaa0af08 (diff) | |
| parent | fe6edc9a70c9fa4551f4e793f89f380529f084cf (diff) | |
| download | build_soong-be6b6a63f85ab6a883a97bb393bcfbcd4e53a494.tar.gz build_soong-be6b6a63f85ab6a883a97bb393bcfbcd4e53a494.tar.bz2 build_soong-be6b6a63f85ab6a883a97bb393bcfbcd4e53a494.zip | |
Merge "Fix data race on cfiExportsMap" into pi-dev
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/library.go | 1 | ||||
| -rw-r--r-- | cc/sanitize.go | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/cc/library.go b/cc/library.go index bac566f7..76f8a8cf 100644 --- a/cc/library.go +++ b/cc/library.go @@ -532,6 +532,7 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, flags.LdFlags = append(flags.LdFlags, "-Wl,--version-script,"+versionScript.String()) linkerDeps = append(linkerDeps, versionScript.Path()) if library.sanitize.isSanitizerEnabled(cfi) { + cfiExportsMap := android.PathForSource(ctx, cfiExportsMapPath) flags.LdFlags = append(flags.LdFlags, "-Wl,--version-script,"+cfiExportsMap.String()) linkerDeps = append(linkerDeps, cfiExportsMap) } diff --git a/cc/sanitize.go b/cc/sanitize.go index 535d28ff..ee549bc0 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -39,7 +39,6 @@ var ( cfiLdflags = []string{"-flto", "-fsanitize-cfi-cross-dso", "-fsanitize=cfi", "-Wl,-plugin-opt,O1"} cfiExportsMapPath = "build/soong/cc/config/cfi_exports.map" - cfiExportsMap android.Path cfiStaticLibsMutex sync.Mutex intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blacklist.txt"} @@ -284,8 +283,6 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { ctx.ModuleErrorf(`Use of "coverage" also requires "address"`) } } - - cfiExportsMap = android.PathForSource(ctx, cfiExportsMapPath) } func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps { |