diff options
| author | 2014-06-11 20:10:02 +0000 | |
|---|---|---|
| committer | 2014-06-10 22:20:24 +0000 | |
| commit | 4daa8b51de9fb8c0d2822aa700fdc6a71762831d (patch) | |
| tree | 633b1d42103f53553f1fb106d3574662d0017d47 | |
| parent | 9ae7672073c588f6fc85052260533b7839775ee3 (diff) | |
| parent | e3d5581266301e6a672af6233220037abf52fea1 (diff) | |
Merge "Fix host Mac build."
| -rw-r--r-- | build/Android.oat.mk | 2 | ||||
| -rw-r--r-- | runtime/arch/x86/quick_entrypoints_x86.S | 4 | ||||
| -rw-r--r-- | runtime/dex_file_verifier.cc | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index bf07ecc182..fbb7eb36c6 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -74,7 +74,6 @@ include $(BUILD_PHONY_PACKAGE) endif # ART_BUILD_HOST # If we aren't building the host toolchain, skip building the target core.art. -ifeq ($(WITH_HOST_DALVIK),true) ifeq ($(ART_BUILD_TARGET),true) include $(CLEAR_VARS) LOCAL_MODULE := core.art @@ -84,4 +83,3 @@ LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.oat.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_CORE_IMG_OUT) include $(BUILD_PHONY_PACKAGE) endif # ART_BUILD_TARGET -endif # WITH_HOST_DALVIK diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index e522143842..28e4dd6ab7 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -1218,10 +1218,10 @@ DEFINE_FUNCTION art_quick_generic_jni_trampoline jnz .Lexception_in_native // Tear down the callee-save frame. - addl MACRO_LITERAL(4), %esp // Remove padding + addl LITERAL(4), %esp // Remove padding CFI_ADJUST_CFA_OFFSET(-4) POP ecx - addl MACRO_LITERAL(4), %esp // Avoid edx, as it may be part of the result. + addl LITERAL(4), %esp // Avoid edx, as it may be part of the result. CFI_ADJUST_CFA_OFFSET(-4) POP ebx POP ebp // Restore callee saves diff --git a/runtime/dex_file_verifier.cc b/runtime/dex_file_verifier.cc index 17d1ffc128..52cece64c1 100644 --- a/runtime/dex_file_verifier.cc +++ b/runtime/dex_file_verifier.cc @@ -120,7 +120,8 @@ bool DexFileVerifier::CheckPointerRange(const void* start, const void* end, cons if (UNLIKELY((range_start < file_start) || (range_start > file_end) || (range_end < file_start) || (range_end > file_end))) { ErrorStringPrintf("Bad range for %s: %zx to %zx", label, - range_start - file_start, range_end - file_start); + static_cast<size_t>(range_start - file_start), + static_cast<size_t>(range_end - file_start)); return false; } return true; |