diff options
author | Eric Botcazou <ebotcazou@adacore.com> | 2009-12-08 18:38:23 +0000 |
---|---|---|
committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2009-12-08 18:38:23 +0000 |
commit | 6b4428ecb642c5ed065e3b5b11799630753cb5db (patch) | |
tree | c5e1e5b7b8e2661973f0b1ea0292a938d9e5415d /libjava/include/dwarf2-signal.h | |
parent | 17314cd9eb95fd1d2390cf6bceed6c329194ddf8 (diff) | |
download | gcc-6b4428ecb642c5ed065e3b5b11799630753cb5db.zip gcc-6b4428ecb642c5ed065e3b5b11799630753cb5db.tar.gz gcc-6b4428ecb642c5ed065e3b5b11799630753cb5db.tar.bz2 |
configure.host (sparc*-sun-solaris2.*): New case.
* configure.host (sparc*-sun-solaris2.*): New case.
* include/dwarf2-signal.h (MAKE_THROW_FRAME, SPARC case): Make dummy.
* include/sparc-signal.h: Do not include ucontext.h.
(SIGNAL_HANDLER): Rename symbol.
(FLUSH_REGISTER_WINDOWS): Delete.
(MAKE_THROW_FRAME): Make dummy.
(INIT_SEGV): Adjust for above renaming.
(INIT_FPE): Likewise.
From-SVN: r155092
Diffstat (limited to 'libjava/include/dwarf2-signal.h')
-rw-r--r-- | libjava/include/dwarf2-signal.h | 58 |
1 files changed, 2 insertions, 56 deletions
diff --git a/libjava/include/dwarf2-signal.h b/libjava/include/dwarf2-signal.h index 43f0cbe9..949bcc0 100644 --- a/libjava/include/dwarf2-signal.h +++ b/libjava/include/dwarf2-signal.h @@ -1,6 +1,6 @@ // dwarf2-signal.h - Catch runtime signals and turn them into exceptions. -/* Copyright (C) 2000, 2001 Free Software Foundation +/* Copyright (C) 2000, 2001, 2009 Free Software Foundation This file is part of libgcj. @@ -58,61 +58,7 @@ do \ _sc->sc_ip++; \ } \ while (0) -#elif defined(__sparc__) -/* We could do the unwind of the signal frame quickly by hand here like - sparc-signal.h does under Solaris, but that makes debugging unwind - failures almost impossible. */ -#if !defined(__arch64__) -#define MAKE_THROW_FRAME(_exception) \ -do \ -{ \ - /* Sparc-32 leaves PC pointing at a faulting instruction \ - always. \ - We advance the PC one instruction past the exception causing PC. \ - This is done because FDEs are found with "context->ra - 1" in the \ - unwinder. \ - Also, the dwarf2 unwind machinery is going to add 8 to the \ - PC it uses on Sparc. So we adjust the PC here. We do it here \ - because we run once for such an exception, however the Sparc specific\ - unwind can run multiple times for the same exception and it would \ - adjust the PC more than once resulting in a bogus value. */ \ - struct sig_regs { \ - unsigned int psr, pc, npc, y, u_regs[16]; \ - } *regp; \ - unsigned int insn; \ - __asm__ __volatile__("ld [%%i7 + 8], %0" : "=r" (insn)); \ - /* mov __NR_sigaction, %g1; Old signal stack layout */ \ - if (insn == 0x821020d8) \ - regp = (struct sig_regs *) _sip; \ - else \ - /* mov __NR_rt_sigaction, %g1; New signal stack layout */ \ - regp = (struct sig_regs *) (_sip + 1); \ - regp->pc = ((regp->pc + 4) - 8); \ -} \ -while (0) -#else -#define MAKE_THROW_FRAME(_exception) \ -do \ -{ \ - /* Sparc-64 leaves PC pointing at a faulting instruction \ - always. \ - We advance the PC one instruction past the exception causing PC. \ - This is done because FDEs are found with "context->ra - 1" in the \ - unwinder. \ - Also, the dwarf2 unwind machinery is going to add 8 to the \ - PC it uses on Sparc. So we adjust the PC here. We do it here \ - because we run once for such an exception, however the Sparc specific\ - unwind can run multiple times for the same exception and it would \ - adjust the PC more than once resulting in a bogus value. */ \ - struct pt_regs { \ - unsigned long u_regs[16]; \ - unsigned long tstate, tpc, tnpc; \ - unsigned int y, fprs; \ - } *regp = (struct pt_regs *) (_sip + 1); \ - regp->tpc = ((regp->tpc + 4) - 8); \ -} \ -while (0) -#endif + #else #define MAKE_THROW_FRAME(_exception) \ do \ |