|
 |
bd144c9 |
diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
|
|
|
bd144c9 |
index b8cc022..d54cae7 100644
|
|
|
bd144c9 |
--- a/coregrind/m_redir.c
|
|
|
bd144c9 |
+++ b/coregrind/m_redir.c
|
|
|
bd144c9 |
@@ -1485,6 +1485,17 @@ void VG_(redir_initialise) ( void )
|
|
|
bd144c9 |
(Addr)&VG_(arm_linux_REDIR_FOR_strcmp),
|
|
|
bd144c9 |
complain_about_stripped_glibc_ldso
|
|
|
bd144c9 |
);
|
|
|
bd144c9 |
+ /* index */
|
|
|
bd144c9 |
+ add_hardwired_spec(
|
|
|
bd144c9 |
+ "ld-linux.so.3", "index",
|
|
|
bd144c9 |
+ (Addr)&VG_(arm_linux_REDIR_FOR_index),
|
|
|
bd144c9 |
+ complain_about_stripped_glibc_ldso
|
|
|
bd144c9 |
+ );
|
|
|
bd144c9 |
+ add_hardwired_spec(
|
|
|
bd144c9 |
+ "ld-linux-armhf.so.3", "index",
|
|
|
bd144c9 |
+ (Addr)&VG_(arm_linux_REDIR_FOR_index),
|
|
|
bd144c9 |
+ complain_about_stripped_glibc_ldso
|
|
|
bd144c9 |
+ );
|
|
|
bd144c9 |
}
|
|
|
bd144c9 |
|
|
|
bd144c9 |
# elif defined(VGP_arm64_linux)
|
|
|
bd144c9 |
diff --git a/coregrind/m_trampoline.S b/coregrind/m_trampoline.S
|
|
|
bd144c9 |
index a532071..0488b54 100644
|
|
|
bd144c9 |
--- a/coregrind/m_trampoline.S
|
|
|
bd144c9 |
+++ b/coregrind/m_trampoline.S
|
|
|
bd144c9 |
@@ -625,26 +625,26 @@ VG_(arm_linux_REDIR_FOR_strlen):
|
|
|
bd144c9 |
bx lr
|
|
|
bd144c9 |
UD2_4
|
|
|
bd144c9 |
|
|
|
bd144c9 |
-//.global VG_(arm_linux_REDIR_FOR_index)
|
|
|
bd144c9 |
-//VG_(arm_linux_REDIR_FOR_index):
|
|
|
bd144c9 |
-// ldrb r3, [r0, #0] @ zero_extendqisi2
|
|
|
bd144c9 |
-// and r1, r1, #255
|
|
|
bd144c9 |
-// cmp r3, r1
|
|
|
bd144c9 |
-// @ lr needed for prologue
|
|
|
bd144c9 |
-// bne .L9
|
|
|
bd144c9 |
-// bx lr
|
|
|
bd144c9 |
-//.L12:
|
|
|
bd144c9 |
-// ldrb r3, [r0, #1]! @ zero_extendqisi2
|
|
|
bd144c9 |
-// cmp r3, r1
|
|
|
bd144c9 |
-// beq .L11
|
|
|
bd144c9 |
-//.L9:
|
|
|
bd144c9 |
-// cmp r3, #0
|
|
|
bd144c9 |
-// bne .L12
|
|
|
bd144c9 |
-// mov r0, #0
|
|
|
bd144c9 |
-// bx lr
|
|
|
bd144c9 |
-//.L11:
|
|
|
bd144c9 |
-// bx lr
|
|
|
bd144c9 |
-// UD2_4
|
|
|
bd144c9 |
+.global VG_(arm_linux_REDIR_FOR_index)
|
|
|
bd144c9 |
+VG_(arm_linux_REDIR_FOR_index):
|
|
|
bd144c9 |
+ ldrb r3, [r0, #0] @ zero_extendqisi2
|
|
|
bd144c9 |
+ and r1, r1, #255
|
|
|
bd144c9 |
+ cmp r3, r1
|
|
|
bd144c9 |
+ @ lr needed for prologue
|
|
|
bd144c9 |
+ bne .L9
|
|
|
bd144c9 |
+ bx lr
|
|
|
bd144c9 |
+.L12:
|
|
|
bd144c9 |
+ ldrb r3, [r0, #1]! @ zero_extendqisi2
|
|
|
bd144c9 |
+ cmp r3, r1
|
|
|
bd144c9 |
+ beq .L11
|
|
|
bd144c9 |
+.L9:
|
|
|
bd144c9 |
+ cmp r3, #0
|
|
|
bd144c9 |
+ bne .L12
|
|
|
bd144c9 |
+ mov r0, #0
|
|
|
bd144c9 |
+ bx lr
|
|
|
bd144c9 |
+.L11:
|
|
|
bd144c9 |
+ bx lr
|
|
|
bd144c9 |
+ UD2_4
|
|
|
bd144c9 |
|
|
|
bd144c9 |
.global VG_(arm_linux_REDIR_FOR_memcpy)
|
|
|
bd144c9 |
VG_(arm_linux_REDIR_FOR_memcpy):
|
|
|
bd144c9 |
diff --git a/coregrind/pub_core_trampoline.h b/coregrind/pub_core_trampoline.h
|
|
|
bd144c9 |
index 3a9bafe..e29427d 100644
|
|
|
bd144c9 |
--- a/coregrind/pub_core_trampoline.h
|
|
|
bd144c9 |
+++ b/coregrind/pub_core_trampoline.h
|
|
|
bd144c9 |
@@ -100,7 +100,7 @@ extern Addr VG_(ppctoc_magic_redirect_return_stub);
|
|
|
bd144c9 |
extern Addr VG_(arm_linux_SUBST_FOR_sigreturn);
|
|
|
bd144c9 |
extern Addr VG_(arm_linux_SUBST_FOR_rt_sigreturn);
|
|
|
bd144c9 |
extern UInt VG_(arm_linux_REDIR_FOR_strlen)( void* );
|
|
|
bd144c9 |
-//extern void* VG_(arm_linux_REDIR_FOR_index) ( void*, Int );
|
|
|
bd144c9 |
+extern void* VG_(arm_linux_REDIR_FOR_index) ( void*, Int );
|
|
|
bd144c9 |
extern void* VG_(arm_linux_REDIR_FOR_memcpy)( void*, void*, Int );
|
|
|
bd144c9 |
extern void* VG_(arm_linux_REDIR_FOR_strcmp)( void*, void* );
|
|
|
bd144c9 |
#endif
|