summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/Android.bp4
-rw-r--r--runtime/arch/arm64/instruction_set_features_arm64.cc3
2 files changed, 5 insertions, 2 deletions
diff --git a/runtime/Android.bp b/runtime/Android.bp
index e9343e7315..8850b3e1d2 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -28,8 +28,8 @@ package {
}
JIT_DEBUG_REGISTER_CODE_LDFLAGS = [
- "-Wl,--keep-unique,__jit_debug_register_code",
- "-Wl,--keep-unique,__dex_debug_register_code",
+ // "-Wl,--keep-unique,__jit_debug_register_code",
+ // "-Wl,--keep-unique,__dex_debug_register_code"
]
// These are defaults for native shared libaries that are expected to be
diff --git a/runtime/arch/arm64/instruction_set_features_arm64.cc b/runtime/arch/arm64/instruction_set_features_arm64.cc
index 1e779f5083..e340cf4eba 100644
--- a/runtime/arch/arm64/instruction_set_features_arm64.cc
+++ b/runtime/arch/arm64/instruction_set_features_arm64.cc
@@ -60,6 +60,7 @@ Arm64FeaturesUniquePtr Arm64InstructionSetFeatures::FromVariant(
"cortex-a57",
"cortex-a72",
"cortex-a73",
+ "kryo785",
};
static const char* arm64_variants_with_crc[] = {
@@ -80,6 +81,7 @@ Arm64FeaturesUniquePtr Arm64InstructionSetFeatures::FromVariant(
"exynos-m3",
"kryo",
"kryo385",
+ "kryo785",
};
static const char* arm64_variants_with_lse[] = {
@@ -140,6 +142,7 @@ Arm64FeaturesUniquePtr Arm64InstructionSetFeatures::FromVariant(
"kryo",
"kryo300",
"kryo385",
+ "kryo785",
};
if (!FindVariantInArray(arm64_known_variants, arraysize(arm64_known_variants), variant)) {
std::ostringstream os;