am 1636459: am 24db1bc: Merge "Fix cfi information for x86."

* commit '16364599e07e0c45eaf3ef65bf7de0c363de2519': Fix cfi information for x86.
CyanogenMod · Jul 14, 2015 · 38ab69f · 38ab69f
2 parents 8a96b31 + 1636459
commit 38ab69f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -1183,8 +1183,8 @@ DEFINE_FUNCTION art_quick_aput_obj
     PUSH eax
 #else
     pushl MIRROR_OBJECT_CLASS_OFFSET(%edx)  // pass arg2 - type of the value to be stored
-#endif
     CFI_ADJUST_CFA_OFFSET(4)
+#endif
     PUSH ebx                      // pass arg1 - component type of the array
     call SYMBOL(artIsAssignableFromCode)  // (Class* a, Class* b)
     addl LITERAL(16), %esp        // pop arguments