From 10efeeca29edbfe077e6ba1b0cf2151cb2e5935c Mon Sep 17 00:00:00 2001 From: Jeff Hao Date: Fri, 29 Mar 2013 14:12:59 -0700 Subject: Fix portable interpreter build. The #define should check if __arm__ or __mips__ is defined. This was causing the host build to be compiled incorrectly and loop forever in dexopt. Change-Id: I6d7a435f0a420a31f2a40d57456762c7fb1d3b4f --- src/invoke_arg_array_builder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/invoke_arg_array_builder.h') diff --git a/src/invoke_arg_array_builder.h b/src/invoke_arg_array_builder.h index e251e33a2c..aca1091184 100644 --- a/src/invoke_arg_array_builder.h +++ b/src/invoke_arg_array_builder.h @@ -68,7 +68,7 @@ class ArgArray { void AppendWide(uint64_t value) { // For ARM and MIPS portable, align wide values to 8 bytes (ArgArray starts at offset of 4). -#if defined(ART_USE_PORTABLE_COMPILER) && (TARGET_ARCH == arm || TARGET_ARCH == mips) +#if defined(ART_USE_PORTABLE_COMPILER) && (defined(__arm__) || defined(__mips__)) if (num_bytes_ % 8 == 0) { num_bytes_ += 4; } -- cgit v1.2.3-59-g8ed1b