svn commit: r258158 - stable/10/sys/i386/i386

[Konstantin Belousov]

Author: kib
Date: Fri Nov 15 07:09:24 2013
New Revision: 258158
URL: http://svnweb.freebsd.org/changeset/base/258158

Log:
  MFC r257858:
  Fix signal delivery for the iBCS2 binaries.
  
  Approved by:	re (gjb)

Modified:
  stable/10/sys/i386/i386/machdep.c
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/i386/i386/machdep.c
==============================================================================
--- stable/10/sys/i386/i386/machdep.c	Fri Nov 15 03:05:33 2013	(r258157)
+++ stable/10/sys/i386/i386/machdep.c	Fri Nov 15 07:09:24 2013	(r258158)
@@ -757,6 +757,8 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, 
 
 	regs->tf_esp = (int)sfp;
 	regs->tf_eip = p->p_sysent->sv_sigcode_base;
+	if (regs->tf_eip == 0)
+		regs->tf_eip = p->p_sysent->sv_psstrings - szsigcode;
 	regs->tf_eflags &= ~(PSL_T | PSL_D);
 	regs->tf_cs = _ucodesel;
 	regs->tf_ds = _udatasel;