From 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Tue, 14 Oct 2014 17:41:57 -0700 Subject: Make ART compile with GCC -O0 again. Tidy up InstructionSetFeatures so that it has a type hierarchy dependent on architecture. Add to instruction_set_test to warn when InstructionSetFeatures don't agree with ones from system properties, AT_HWCAP and /proc/cpuinfo. Clean-up class linker entry point logic to not return entry points but to test whether the passed code is the particular entrypoint. This works around image trampolines that replicate entrypoints. Bug: 17993736 Change-Id: I5f4b49e88c3b02a79f9bee04f83395146ed7be23 --- runtime/runtime.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'runtime/runtime.h') diff --git a/runtime/runtime.h b/runtime/runtime.h index 7bffc335ef..f3bea17d6d 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -483,10 +483,6 @@ class Runtime { return target_sdk_version_; } - static const char* GetDefaultInstructionSetFeatures() { - return kDefaultInstructionSetFeatures; - } - private: static void InitPlatformSignalHandlers(); @@ -506,8 +502,6 @@ class Runtime { // A pointer to the active runtime or NULL. static Runtime* instance_; - static const char* kDefaultInstructionSetFeatures; - // NOTE: these must match the gc::ProcessState values as they come directly from the framework. static constexpr int kProfileForground = 0; static constexpr int kProfileBackgrouud = 1; -- cgit v1.2.3