From 30cad60d51ea2fcd97586c80779e624dfe9e686d Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Mon, 6 Aug 2007 07:17:59 -0700 Subject: [PATCH] re PR libobjc/30731 (Warnings while compiling libobjc with the uleb128 changes) 2007-08-06 Andrew Pinski PR libobjc/30731 * exception.c (parse_lsda_header): Use _uleb128_t/_sleb128_t instead of _Unwind_Word for variables which are used in read_uleb128/read_sleb128. (PERSONALITY_FUNCTION): Likewise. From-SVN: r127242 --- libobjc/ChangeLog | 8 ++++++++ libobjc/exception.c | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index f77dc40580a..ae946e899ce 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,11 @@ +2007-08-06 Andrew Pinski + + PR libobjc/30731 + * exception.c (parse_lsda_header): Use _uleb128_t/_sleb128_t instead + of _Unwind_Word for variables which are used in + read_uleb128/read_sleb128. + (PERSONALITY_FUNCTION): Likewise. + 2007-07-05 H.J. Lu * aclocal.m4: Regenerated. diff --git a/libobjc/exception.c b/libobjc/exception.c index e1de2ae5af1..4777c3bdd41 100644 --- a/libobjc/exception.c +++ b/libobjc/exception.c @@ -75,7 +75,7 @@ static const unsigned char * parse_lsda_header (struct _Unwind_Context *context, const unsigned char *p, struct lsda_header_info *info) { - _Unwind_Word tmp; + _uleb128_t tmp; unsigned char lpstart_encoding; info->Start = (context ? _Unwind_GetRegionStart (context) : 0); @@ -205,7 +205,7 @@ PERSONALITY_FUNCTION (int version, return _URC_CONTINUE_UNWIND; else { - _Unwind_Word cs_lp, cs_action; + _uleb128_t cs_lp, cs_action; do { p = read_uleb128 (p, &cs_lp); @@ -225,7 +225,7 @@ PERSONALITY_FUNCTION (int version, while (p < info.action_table) { _Unwind_Ptr cs_start, cs_len, cs_lp; - _Unwind_Word cs_action; + _uleb128_t cs_action; /* Note that all call-site encodings are "absolute" displacements. */ p = read_encoded_value (0, info.call_site_encoding, p, &cs_start); @@ -271,7 +271,7 @@ PERSONALITY_FUNCTION (int version, else { /* Otherwise we have a catch handler. */ - _Unwind_Sword ar_filter, ar_disp; + _sleb128_t ar_filter, ar_disp; while (1) { -- 2.30.2