f8560c
diff -Nrup a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c
f8560c
--- a/sysdeps/linux-gnu/arm/trace.c	2013-03-11 17:23:39.000000000 -0600
f8560c
+++ b/sysdeps/linux-gnu/arm/trace.c	2017-02-17 09:39:42.233547101 -0700
f8560c
@@ -155,6 +155,8 @@ arm_get_next_pcs(struct process *proc,
f8560c
 	const unsigned cond = BITS(this_instr, 28, 31);
f8560c
 	const unsigned opcode = BITS(this_instr, 24, 27);
f8560c
 
f8560c
+	uint32_t operand1, operand2, result = 0;
f8560c
+
f8560c
 	if (cond == COND_NV)
f8560c
 		switch (opcode) {
f8560c
 			arch_addr_t addr;
f8560c
@@ -170,7 +172,6 @@ arm_get_next_pcs(struct process *proc,
f8560c
 		}
f8560c
 	else
f8560c
 		switch (opcode) {
f8560c
-			uint32_t operand1, operand2, result = 0;
f8560c
 		case 0x0:
f8560c
 		case 0x1:			/* data processing */
f8560c
 		case 0x2: