From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Tue, 19 Jul 2022 11:20:55 +0000 (+0100)
Subject: fix-build-on-armhf
X-Git-Tag: archive/raspbian/11.0.0+r48-4+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6fdacb1eb5376764feed973ae8e529cc76a8f4cf;p=android-platform-art.git

fix-build-on-armhf


Gbp-Pq: Name fix-build-on-armhf.patch
---

diff --git a/runtime/arch/arm/jni_entrypoints_arm.S b/runtime/arch/arm/jni_entrypoints_arm.S
index ceef772..9031350 100644
--- a/runtime/arch/arm/jni_entrypoints_arm.S
+++ b/runtime/arch/arm/jni_entrypoints_arm.S
@@ -234,7 +234,7 @@ ENTRY art_jni_dlsym_lookup_critical_stub
     // Do the tail call.
     bx     ip
     .cfi_restore_state
-    .cfi_def_cfa x4, FRAME_SIZE_SAVE_REFS_AND_ARGS
+    .cfi_def_cfa r4, FRAME_SIZE_SAVE_REFS_AND_ARGS
 
 3:
     // Drop stack args and the SaveRefsAndArgs reservation.