summaryrefslogtreecommitdiffstats
path: root/runtime/entrypoints
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-11-04 14:43:18 -0800
committerIan Rogers <irogers@google.com>2014-11-04 14:43:18 -0800
commitde2db523960444ca8abd175814374cb3782f1632 (patch)
tree408c85fcf5f889b2cb81a8ee9b6dd1746b4c1aa8 /runtime/entrypoints
parentcc19cb6845f427036513e155d50c11533933c63f (diff)
downloadart-de2db523960444ca8abd175814374cb3782f1632.zip
art-de2db523960444ca8abd175814374cb3782f1632.tar.gz
art-de2db523960444ca8abd175814374cb3782f1632.tar.bz2
Fix mac build.
Change-Id: I228cdb0b25cd0f2c5e745a87a97aa8fd3c8a160a
Diffstat (limited to 'runtime/entrypoints')
-rw-r--r--runtime/entrypoints/quick/quick_alloc_entrypoints.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
index cccf8f3..a6b5ffd 100644
--- a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
@@ -227,8 +227,8 @@ void SetQuickAllocEntryPointsInstrumented(bool instrumented) {
}
void ResetQuickAllocEntryPoints(QuickEntryPoints* qpoints) {
- switch (entry_points_allocator) {
#if !defined(__APPLE__) || !defined(__LP64__)
+ switch (entry_points_allocator) {
case gc::kAllocatorTypeDlMalloc: {
SetQuickAllocEntryPoints_dlmalloc(qpoints, entry_points_instrumented);
break;
@@ -247,12 +247,14 @@ void ResetQuickAllocEntryPoints(QuickEntryPoints* qpoints) {
SetQuickAllocEntryPoints_tlab(qpoints, entry_points_instrumented);
break;
}
-#endif
- default: {
- UNIMPLEMENTED(FATAL);
- UNREACHABLE();
- }
+ default:
+ break;
}
+#else
+ UNUSED(qpoints);
+#endif
+ UNIMPLEMENTED(FATAL);
+ UNREACHABLE();
}
} // namespace art