2009-07-14 Michael Snyder <msnyder@vmware.com>

	* gdb.arch/i386-signal.c (sigframe): Add a nop to avoid
	confusing the i386 epilogue unwinder.

gdb/testsuite/ChangeLog

+2009-07-14  Michael Snyder  <msnyder@vmware.com>
+
+	* gdb.arch/i386-signal.c (sigframe): Add a nop to avoid
+	confusing the i386 epilogue unwinder.
+
 2009-07-14  Stan Shebs  <stan@codesourcery.com>
 	* gdb.trace/tracecmd.exp: Add basic test of tracepoint conditions.

gdb/testsuite/gdb.arch/i386-signal.c

@@ -37,6 +37,10 @@ main (void)
    The default CIE created by gas suffices to unwind from an empty
    function.  */
 
+/* Note: to make sure that the Dwarf unwinder gets to handle
+   the frame, we add an extra 'nop' after the label.  Otherwise,
+   the epilogue unwinder will see the 'ret' and grab the frame.  */
+
 asm(".text\n"
     "    .align 8\n"
     "    .globl setup\n"
@@ -49,5 +53,6 @@ asm(".text\n"
     "    nop\n"
     "    .globl sigframe\n"
     "sigframe:\n"
+    "    nop\n"
     "    ret\n"
     "    .cfi_endproc");