From: Matthias Klose <doko@ubuntu.com>
To: Andrew Haley <aph@redhat.com>
Cc: Paul Brook <paul@codesourcery.com>,
gcc-patches@gcc.gnu.org, GCC Java <java@gcc.gnu.org>,
Nicola Pero <nicola.pero@meta-innovation.com>
Subject: Re: [patch] C6X unwinding/exception handling
Date: Mon, 10 Oct 2011 11:27:00 -0000 [thread overview]
Message-ID: <4E92D68A.6080308@ubuntu.com> (raw)
In-Reply-To: <4E92C9D0.10106@redhat.com>
On 10/10/2011 12:32 PM, Andrew Haley wrote:
> On 10/09/2011 12:09 PM, Matthias Klose wrote:
>> This did break libobjc and libjava on arm-linux-gnueabi.
>>
>> libobjc now has an undefined reference to _Unwind_decode_target2, which can be
>> avoided with
with this patch, the libobjc testsuite results looks as before this change.
>>
>> --- libobjc/exception.c.orig 2011-07-21 15:33:57.000000000 +0000
>> +++ libobjc/exception.c 2011-10-09 10:53:12.554940776 +0000
>> @@ -182,7 +182,7 @@
>> _Unwind_Ptr ptr;
>>
>> ptr = (_Unwind_Ptr) (info->TType - (i * 4));
>> - ptr = _Unwind_decode_target2 (ptr);
>> + ptr = _Unwind_decode_typeinfo_ptr (info->ttype_base, (_Unwind_Word) ptr);
>>
>> /* NULL ptr means catch-all. Note that if the class is not found,
>> this will abort the program. */
>>
>> libjava fails to build, the same change doesn't work for libjava/exception.cc,
>> because the struct lsda_header_info in exception.cc is missing the ttype_base
>> member. Any suggestions?
>
> Is this fixable without backing out Paul Brooks' patch?
currently testing
Index: libjava/exception.cc
===================================================================
--- libjava/exception.cc (revision 179739)
+++ libjava/exception.cc (working copy)
@@ -135,6 +135,7 @@
{
_Unwind_Ptr Start;
_Unwind_Ptr LPStart;
+ _Unwind_Ptr ttype_base;
const unsigned char *TType;
const unsigned char *action_table;
unsigned char ttype_encoding;
@@ -184,7 +185,7 @@
_Unwind_Ptr ptr;
ptr = (_Unwind_Ptr) (info->TType - (i * 4));
- ptr = _Unwind_decode_target2(ptr);
+ ptr = _Unwind_decode_typeinfo_ptr (info->ttype_base, (_Unwind_Word) ptr);
return reinterpret_cast<void **>(ptr);
}
@@ -325,6 +326,7 @@
// Parse the LSDA header.
p = parse_lsda_header (context, language_specific_data, &info);
+ info.ttype_base = base_of_encoded_value (info.ttype_encoding, context);
#ifdef HAVE_GETIPINFO
ip = _Unwind_GetIPInfo (context, &ip_before_insn);
#else
next prev parent reply other threads:[~2011-10-10 11:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201108041531.58790.paul@codesourcery.com>
[not found] ` <201109131348.13087.paul@codesourcery.com>
2011-10-09 11:10 ` Matthias Klose
2011-10-10 10:33 ` Andrew Haley
2011-10-10 11:27 ` Matthias Klose [this message]
2011-10-10 12:23 ` Paul Brook
2011-10-17 11:01 ` Matthias Klose
2011-10-17 11:21 ` Andrew Haley
2011-10-17 11:27 ` Matthias Klose
2011-10-17 13:49 ` Paul Brook
2011-10-17 14:11 ` Nicola Pero
2011-10-20 12:29 ` Bernd Schmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E92D68A.6080308@ubuntu.com \
--to=doko@ubuntu.com \
--cc=aph@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=java@gcc.gnu.org \
--cc=nicola.pero@meta-innovation.com \
--cc=paul@codesourcery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).