OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR target/50678 (FAIL: c52104y on x86_64-apple-darwin10) 

PR target/50678
	* init.c (__darwin_major_version): New function for x86-64/Darwin.
	(__gnat_adjust_context_for_raise) [Darwin]: Disable the workaround
	on Darwin 12 and above.

From-SVN: r195863
This commit is contained in:
Simon Wright 2013-02-07 18:07:58 +00:00 committed by Eric Botcazou
parent 32ebab59f4
commit c6176f2c3a
2 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ada/ChangeLog
View File

@ -1,3 +1,10 @@
2013-02-07 Simon Wright <simon@pushface.org>
PR target/50678
* init.c (__darwin_major_version): New function for x86-64/Darwin.
(__gnat_adjust_context_for_raise) [Darwin]: Disable the workaround
on Darwin 12 and above.
2013-01-06 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/decl.c (gnat_to_gnu_entity) <discrete_type>: Do not

50
gcc/ada/init.c
View File

@ -2256,7 +2256,9 @@ __gnat_install_handler(void)
#elif defined(__APPLE__)
#include <signal.h>
#include <stdlib.h>
#include <sys/syscall.h>
#include <sys/sysctl.h>
#include <mach/mach_vm.h>
#include <mach/mach_init.h>
#include <mach/vm_statistics.h>
@ -2295,20 +2297,52 @@ __gnat_is_stack_guard (mach_vm_address_t addr)
#define HAVE_GNAT_ADJUST_CONTEXT_FOR_RAISE
#if defined (__x86_64__)
static int
__darwin_major_version (void)
{
static int cache = -1;
if (cache < 0)
{
int mib[2] = {CTL_KERN, KERN_OSRELEASE};
size_t len;
/* Find out how big the buffer needs to be (and set cache to 0
on failure). */
if (sysctl (mib, 2, NULL, &len, NULL, 0) == 0)
{
char release[len];
sysctl (mib, 2, release, &len, NULL, 0);
/* Darwin releases are of the form L.M.N where L is the major
version, so strtol will return L. */
cache = (int) strtol (release, NULL, 10);
}
else
{
cache = 0;
}
}
return cache;
}
#endif
void
__gnat_adjust_context_for_raise (int signo ATTRIBUTE_UNUSED,
void *ucontext ATTRIBUTE_UNUSED)
{
#if defined (__x86_64__)
/* Work around radar #10302855/pr50678, where the unwinders (libunwind or
libgcc_s depending on the system revision) and the DWARF unwind data for
the sigtramp have different ideas about register numbering (causing rbx
and rdx to be transposed).. */
ucontext_t *uc = (ucontext_t *)ucontext ;
unsigned long t = uc->uc_mcontext->__ss.__rbx;
if (__darwin_major_version () < 12)
{
/* Work around radar #10302855, where the unwinders (libunwind or
libgcc_s depending on the system revision) and the DWARF unwind
data for sigtramp have different ideas about register numbering,
causing rbx and rdx to be transposed. */
ucontext_t *uc = (ucontext_t *)ucontext;
unsigned long t = uc->uc_mcontext->__ss.__rbx;
uc->uc_mcontext->__ss.__rbx = uc->uc_mcontext->__ss.__rdx;
uc->uc_mcontext->__ss.__rdx = t;
uc->uc_mcontext->__ss.__rbx = uc->uc_mcontext->__ss.__rdx;
uc->uc_mcontext->__ss.__rdx = t;
}
#endif
}