git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Unwind support on DragonFly BSD after sigtramp move 

2017-07-19  John Marino  <gnugcc@marino.st>

	* config/i386/dragonfly-unwind.h: Handle sigtramp relocation.

From-SVN: r250354
This commit is contained in:
John Marino 2017-07-19 15:55:11 +00:00 committed by Jonathan Wakely
parent e020783cd6
commit de7422048e
2 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libgcc/ChangeLog
View File

@ -1,3 +1,7 @@
2017-07-19 John Marino <gnugcc@marino.st>
* config/i386/dragonfly-unwind.h: Handle sigtramp relocation.
2017-07-12 Michael Meissner <meissner@linux.vnet.ibm.com> 2017-07-12 Michael Meissner <meissner@linux.vnet.ibm.com>
PR target/81193 PR target/81193

53
libgcc/config/i386/dragonfly-unwind.h
View File

@ -28,9 +28,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include <sys/types.h> #include <sys/types.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/param.h>
#include <signal.h> #include <signal.h>
#include <sys/ucontext.h> #include <sys/ucontext.h>
#include <machine/sigframe.h> #include <machine/sigframe.h>
#if __DragonFly_version > 400800
#include <sys/kinfo.h>
#endif
#define REG_NAME(reg) sf_uc.uc_mcontext.mc_## reg #define REG_NAME(reg) sf_uc.uc_mcontext.mc_## reg
@ -39,20 +43,44 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define MD_FALLBACK_FRAME_STATE_FOR x86_64_dragonfly_fallback_frame_state #define MD_FALLBACK_FRAME_STATE_FOR x86_64_dragonfly_fallback_frame_state
static void static int
x86_64_sigtramp_range (unsigned char **start, unsigned char **end) x86_64_outside_sigtramp_range (unsigned char *pc)
{ {
static int sigtramp_range_determined = 0;
static unsigned char *sigtramp_start, *sigtramp_end;
if (sigtramp_range_determined == 0)
{
#if __DragonFly_version > 400800
struct kinfo_sigtramp kst = {0};
size_t len = sizeof (kst);
int mib[3] = { CTL_KERN, KERN_PROC, KERN_PROC_SIGTRAMP };
sigtramp_range_determined = 1;
if (sysctl (mib, 3, &kst, &len, NULL, 0) == 0)
{
sigtramp_range_determined = 2;
sigtramp_start = kst.ksigtramp_start;
sigtramp_end = kst.ksigtramp_end;
}
#else
unsigned long ps_strings; unsigned long ps_strings;
int mib[2]; size_t len = sizeof (ps_strings);
size_t len; int mib[2] = { CTL_KERN, KERN_PS_STRINGS };
mib[0] = CTL_KERN; sigtramp_range_determined = 1;
mib[1] = KERN_PS_STRINGS; if (sysctl (mib, 2, &ps_strings, &len, NULL, 0) == 0)
len = sizeof (ps_strings); {
sysctl (mib, 2, &ps_strings, &len, NULL, 0); sigtramp_range_determined = 2;
sigtramp_start = (unsigned char *)ps_strings - 32;
sigtramp_end = (unsigned char *)ps_strings;
}
#endif
}
if (sigtramp_range_determined < 2) /* sysctl failed if < 2 */
return 1;
*start = (unsigned char *)ps_strings - 32; return (pc < sigtramp_start || pc >= sigtramp_end );
*end = (unsigned char *)ps_strings;
} }
@ -60,13 +88,10 @@ static _Unwind_Reason_Code
x86_64_dragonfly_fallback_frame_state x86_64_dragonfly_fallback_frame_state
(struct _Unwind_Context *context, _Unwind_FrameState *fs) (struct _Unwind_Context *context, _Unwind_FrameState *fs)
{ {
unsigned char *pc = context->ra;
unsigned char *sigtramp_start, *sigtramp_end;
struct sigframe *sf; struct sigframe *sf;
long new_cfa; long new_cfa;
x86_64_sigtramp_range(&sigtramp_start, &sigtramp_end); if (x86_64_outside_sigtramp_range(context->ra))
if (pc >= sigtramp_end || pc < sigtramp_start)
return _URC_END_OF_STACK; return _URC_END_OF_STACK;
sf = (struct sigframe *) context->cfa; sf = (struct sigframe *) context->cfa;