tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Prevent clang from using the x18 register on arm64."" am: ec2f6cba80 am: 3d317f2b24

Browse source 
am: 0ea551a11e

Change-Id: I94f6761877746a3f8c365956cdde6f1f8e3734ef
This commit is contained in:
Yi Kong 2018-11-08 17:54:37 -08:00 committed by android-build-merger
commit 584e018337
3 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cc/config/arm64_device.go
View file

@ -25,11 +25,6 @@ var (
arm64Cflags = []string{
// Help catch common 32/64-bit errors.
"-Werror=implicit-function-declaration",
// Prevent use of x18 register.
// TODO(pcc): Remove this flag once we upgrade past LLVM r340889
// which does this by default on Android.
"-ffixed-x18",
}
arm64ArchVariantCflags = map[string][]string{

7
cc/lto.go
View file

@ -113,13 +113,6 @@ func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags {
flags.LdFlags = append(flags.LdFlags, "-Wl,-plugin-opt,-inline-threshold=0")
flags.LdFlags = append(flags.LdFlags, "-Wl,-plugin-opt,-unroll-threshold=0")
}
if ctx.Arch().ArchType == android.Arm64 {
// Prevent use of x18 register on arm64.
// TODO(pcc): Remove this flag once we upgrade past LLVM r340889
// which does this by default on Android.
flags.LdFlags = append(flags.LdFlags, "-Wl,-plugin-opt,-mattr=+reserve-x18")
}
}
return flags
}

7
cc/sanitize.go
View file

@ -471,13 +471,6 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
diagSanitizers = append(diagSanitizers, "cfi")
}
if ctx.Arch().ArchType == android.Arm64 {
// Prevent use of x18 register on arm64.
// TODO(pcc): Remove this flag once we upgrade past LLVM r340889
// which does this by default on Android.
flags.LdFlags = append(flags.LdFlags, "-Wl,-plugin-opt,-mattr=+reserve-x18")
}
if ctx.staticBinary() {
_, flags.CFlags = removeFromList("-fsanitize-cfi-cross-dso", flags.CFlags)
_, flags.LdFlags = removeFromList("-fsanitize-cfi-cross-dso", flags.LdFlags)