StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Separate out Cross DSO flag for Bazel"

Browse Source
This commit is contained in:
Trevor Radcliffe
2023-04-12 18:38:39 +00:00
committed by Gerrit Code Review
parent f937bad953 9f4b4769c5
commit 2a1de1bfe6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cc/sanitize.go
View File

@@ -64,12 +64,13 @@ var (
cfiBlocklistPath = "external/compiler-rt/lib/cfi" cfiBlocklistPath = "external/compiler-rt/lib/cfi"
cfiBlocklistFilename = "cfi_blocklist.txt" cfiBlocklistFilename = "cfi_blocklist.txt"
cfiCflags = []string{"-flto", "-fsanitize-cfi-cross-dso", cfiCrossDsoFlag = "-fsanitize-cfi-cross-dso"
cfiCflags = []string{"-flto", cfiCrossDsoFlag,
"-fsanitize-ignorelist=" + cfiBlocklistPath + "/" + cfiBlocklistFilename} "-fsanitize-ignorelist=" + cfiBlocklistPath + "/" + cfiBlocklistFilename}
// -flto and -fvisibility are required by clang when -fsanitize=cfi is // -flto and -fvisibility are required by clang when -fsanitize=cfi is
// used, but have no effect on assembly files // used, but have no effect on assembly files
cfiAsflags = []string{"-flto", "-fvisibility=default"} cfiAsflags = []string{"-flto", "-fvisibility=default"}
cfiLdflags = []string{"-flto", "-fsanitize-cfi-cross-dso", "-fsanitize=cfi", cfiLdflags = []string{"-flto", cfiCrossDsoFlag, "-fsanitize=cfi",
"-Wl,-plugin-opt,O1"} "-Wl,-plugin-opt,O1"}
cfiExportsMapPath = "build/soong/cc/config" cfiExportsMapPath = "build/soong/cc/config"
cfiExportsMapFilename = "cfi_exports.map" cfiExportsMapFilename = "cfi_exports.map"
@@ -393,11 +394,13 @@ func init() {
exportedVars.ExportStringList("DeviceOnlySanitizeFlags", deviceOnlySanitizeFlags) exportedVars.ExportStringList("DeviceOnlySanitizeFlags", deviceOnlySanitizeFlags)
// Leave out "-flto" from the slices exported to bazel, as we will use the // Leave out "-flto" from the slices exported to bazel, as we will use the
// dedicated LTO feature for this // dedicated LTO feature for this. For C Flags and Linker Flags, also leave
exportedVars.ExportStringList("CfiCFlags", cfiCflags[1:]) // out the cross DSO flag which will be added separately by transitions.
exportedVars.ExportStringList("CfiCFlags", cfiCflags[2:])
exportedVars.ExportStringList("CfiLdFlags", cfiLdflags[2:])
exportedVars.ExportStringList("CfiAsFlags", cfiAsflags[1:]) exportedVars.ExportStringList("CfiAsFlags", cfiAsflags[1:])
exportedVars.ExportStringList("CfiLdFlags", cfiLdflags[1:])
exportedVars.ExportString("CfiCrossDsoFlag", cfiCrossDsoFlag)
exportedVars.ExportString("CfiBlocklistPath", cfiBlocklistPath) exportedVars.ExportString("CfiBlocklistPath", cfiBlocklistPath)
exportedVars.ExportString("CfiBlocklistFilename", cfiBlocklistFilename) exportedVars.ExportString("CfiBlocklistFilename", cfiBlocklistFilename)
exportedVars.ExportString("CfiExportsMapPath", cfiExportsMapPath) exportedVars.ExportString("CfiExportsMapPath", cfiExportsMapPath)