diff options
author | Mark P Mendell <mark.p.mendell@intel.com> | 2015-01-27 15:45:27 +0000 |
---|---|---|
committer | Mark Mendell <mark.p.mendell@intel.com> | 2015-01-27 17:00:21 -0500 |
commit | 966c3ae95d3c699ee9fbdbccc1acdaaf02325faf (patch) | |
tree | 7a9bd5dbfb8b02f8bb7e3387876be0c1f7844063 /runtime/oat.h | |
parent | 85ed6bdd890c08f50c205d7f0604b5a35603b13e (diff) | |
download | art-966c3ae95d3c699ee9fbdbccc1acdaaf02325faf.tar.gz art-966c3ae95d3c699ee9fbdbccc1acdaaf02325faf.tar.bz2 art-966c3ae95d3c699ee9fbdbccc1acdaaf02325faf.zip |
Revert "Revert "ART: Implement X86 hard float (Quick/JNI/Baseline)""
This reverts commit 949c91fb91f40a4a80b2b492913cf8541008975e.
This time, don't clobber EBX before saving it.
Redo some of the macros to make register usage explicit.
Change-Id: I8db8662877cd006816e16a28f42444ab7c36bfef
Diffstat (limited to 'runtime/oat.h')
-rw-r--r-- | runtime/oat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/oat.h b/runtime/oat.h index 8e63d3ae8d..3e2860602e 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -32,7 +32,7 @@ class InstructionSetFeatures; class PACKED(4) OatHeader { public: static constexpr uint8_t kOatMagic[] = { 'o', 'a', 't', '\n' }; - static constexpr uint8_t kOatVersion[] = { '0', '5', '3', '\0' }; + static constexpr uint8_t kOatVersion[] = { '0', '5', '4', '\0' }; static constexpr const char* kImageLocationKey = "image-location"; static constexpr const char* kDex2OatCmdLineKey = "dex2oat-cmdline"; |