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

Merge changes from topic "separate_code" am: 894cdee30a am: 7346c709e2

Browse Source 
Change-Id: Iff366bacfb9db627f1a73ad1fa7b7a610f0b1a1d
This commit is contained in:
Automerger Merge Worker
2019-12-16 21:22:58 +00:00
parent 1ae7cbd085 7346c709e2
commit a923639223
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/xom.go
View File

@@ -68,7 +68,10 @@ func (xom *xom) flags(ctx ModuleContext, flags Flags) Flags {
if !disableXom || (xom.Properties.Xom != nil && *xom.Properties.Xom) { if !disableXom || (xom.Properties.Xom != nil && *xom.Properties.Xom) {
// XOM is only supported on AArch64 when using lld. // XOM is only supported on AArch64 when using lld.
if ctx.Arch().ArchType == android.Arm64 && ctx.useClangLld(ctx) { if ctx.Arch().ArchType == android.Arm64 && ctx.useClangLld(ctx) {
flags.Local.LdFlags = append(flags.Local.LdFlags, "-Wl,-execute-only") flags.Local.LdFlags = append(flags.Local.LdFlags,
"-Wl,--execute-only",
"-Wl,-z,separate-code",
)
} }
} }

3
rust/config/arm64_device.go
View File

@@ -27,7 +27,8 @@ var (
"-Wl,--icf=safe", "-Wl,--icf=safe",
"-Wl,-z,max-page-size=4096", "-Wl,-z,max-page-size=4096",
"-Wl,-execute-only", "-Wl,--execute-only",
"-Wl,-z,separate-code",
} }
Arm64ArchVariantRustFlags = map[string][]string{ Arm64ArchVariantRustFlags = map[string][]string{