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

Change-Id: Iff366bacfb9db627f1a73ad1fa7b7a610f0b1a1d

cc/xom.go

@@ -68,7 +68,10 @@ func (xom *xom) flags(ctx ModuleContext, flags Flags) Flags {
 	if !disableXom || (xom.Properties.Xom != nil && *xom.Properties.Xom) {
 		// XOM is only supported on AArch64 when using lld.
 		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",
+			)
 		}
 	}
 

rust/config/arm64_device.go

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