From 3b37073e52f3b8a2a9e16bc9a019ef2607a97245 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 9 Oct 2014 18:34:28 +0100 Subject: [PATCH] Fix arm64 build: move macro usage after definition. The build was broken by https://android-review.googlesource.com/110341 Change-Id: I137b4bc694af15465bf0db3ffe337950064d2a53 --- runtime/arch/arm64/quick_entrypoints_arm64.S | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S index 252e89e93..52a2a881f 100644 --- a/runtime/arch/arm64/quick_entrypoints_arm64.S +++ b/runtime/arch/arm64/quick_entrypoints_arm64.S @@ -937,12 +937,6 @@ ENTRY art_quick_do_long_jump END art_quick_do_long_jump /* - * Entry from managed code that calls artHandleFillArrayDataFromCode and delivers exception on - * failure. - */ -TWO_ARG_REF_DOWNCALL art_quick_handle_fill_data, artHandleFillArrayDataFromCode, RETURN_IF_W0_IS_ZERO_OR_DELIVER - - /* * Entry from managed code that calls artLockObjectFromCode, may block for GC. x0 holds the * possibly null object to lock. * @@ -1248,6 +1242,12 @@ END \name .endm /* + * Entry from managed code that calls artHandleFillArrayDataFromCode and delivers exception on + * failure. + */ +TWO_ARG_REF_DOWNCALL art_quick_handle_fill_data, artHandleFillArrayDataFromCode, RETURN_IF_W0_IS_ZERO_OR_DELIVER + + /* * Entry from managed code when uninitialized static storage, this stub will run the class * initializer and deliver the exception on error. On success the static storage base is * returned. -- 2.11.0