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

Revert "Prevent clang from using the x18 register on arm64."

Browse Source 
This reverts commit 98d8580c3a.

Change no longer needed with the new LLVM toolchain update.

Bug: 112907825
Bug: 111759196
Change-Id: Ife3ce47a602dd850ac84bb51abc70c0ca157776e
This commit is contained in:
Yi Kong
2018-11-08 21:07:08 +00:00
parent 98d8580c3a
commit 8c3c0f50d0
3 changed files with 0 additions and 19 deletions
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{ arm64Cflags = []string{
// Help catch common 32/64-bit errors. // Help catch common 32/64-bit errors.
"-Werror=implicit-function-declaration", "-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{ 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,-inline-threshold=0")
flags.LdFlags = append(flags.LdFlags, "-Wl,-plugin-opt,-unroll-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 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") 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() { if ctx.staticBinary() {
_, flags.CFlags = removeFromList("-fsanitize-cfi-cross-dso", flags.CFlags) _, flags.CFlags = removeFromList("-fsanitize-cfi-cross-dso", flags.CFlags)
_, flags.LdFlags = removeFromList("-fsanitize-cfi-cross-dso", flags.LdFlags) _, flags.LdFlags = removeFromList("-fsanitize-cfi-cross-dso", flags.LdFlags)