* inftarg.c (child_thread_alive): New function to see if a

[deliverable/binutils-gdb.git] / gdb / i386-tdep.c

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 4b2471fa6fe370d38190186ddce75cb4b39adbac..a02eace9a5f5860a99916007dd29d04746e104f3 100644 (file)
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -22,12 +22,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "inferior.h"
 #include "gdbcore.h"
 #include "target.h"
-<<<<<<< i386-tdep.c
 #include "floatformat.h"
-||||||| 1.26
-=======
 #include "symtab.h"
->>>>>>> 1.27
 
 static long
 i386_get_frame_setup PARAMS ((int));
@@ -654,9 +650,9 @@ i386v4_sigtramp_saved_pc (frame)
     {
       if (STREQ (name, "_sigreturn"))
        saved_pc_offset = 132 + 14 * 4;
-      if (STREQ (name, "_sigacthandler"))
+      else if (STREQ (name, "_sigacthandler"))
        saved_pc_offset = 80 + 14 * 4;
-      if (STREQ (name, "sigvechandler"))
+      else if (STREQ (name, "sigvechandler"))
        saved_pc_offset = 120 + 14 * 4;
     }