Fix strace by applying this patch from up-stream.android-sdk-tools_r12android-sdk-adt_r12android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1gingerbread-releasegingerbread-mr4-releasegingerbread

2007-11-01  Roland McGrath  <roland@redhat.com>

	* syscall.c (get_scno) [ARM]: Check TCB_WAITEXECVE.
	Reported by Bernhard Fischer <rep.dot.nop@gmail.com>.

Change-Id: Iba2a50fc1104bfe899163e975cf94745d72b4db6
http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commitdiff;h=9bc6340d21cb20d2c775863598068c1a29460eba

1 files changed, 8 insertions, 0 deletions

diff --git a/syscall.c b/syscall.c
index 0958e1bb..fa9c4546 100644
--- a/syscall.c
+++ b/syscall.c
@@ -1013,6 +1013,14 @@ struct tcb *tcp;
 	 * We only need to grab the syscall number on syscall entry.
 	 */
 	if (regs.ARM_ip == 0) {
+		if (!(tcp->flags & TCB_INSYSCALL)) {
+			/* Check if we return from execve. */
+			if (tcp->flags & TCB_WAITEXECVE) {
+				tcp->flags &= ~TCB_WAITEXECVE;
+				return 0;
+			}
+		}
+
 		/*
 		 * Note: we only deal with only 32-bit CPUs here.
 		 */