Re-apply accidentally reverted change:

	2007-02-07  Andreas Krebbel  <krebbel1@de.ibm.com>

	* raise-gcc.c (get_region_description_for, get_call_site_action_for,
	get_action_description_for): Replace _Unwind_Word with _uleb128_t
	and _Unwind_SWord with _sleb128_t.

From-SVN: r128252

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8de9c577d154fad2035c1a336257de78214e0173..b9e57dad69434aa1ed15eb77c7f201fe3722f596 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,18 +1,12 @@
-2007-09-07  Janis Johnson  <janis187@us.ibm.com>
+2007-09-07  Eric Botcazou  <ebotcazou@adacore.com>
 
-       Reapply reverted change:
+       Re-apply accidentally reverted change:
 
-        2007-09-06  Eric Botcazou  <ebotcazou@adacore.com>
+       2007-02-07  Andreas Krebbel  <krebbel1@de.ibm.com>
 
-        * trans.c (convert_with_check): Update call to real_2expN.
-
-2007-09-06  Janis Johnson  <janis187@us.ibm.com>
-
-       Revert:
-
-       2007-09-06  Eric Botcazou  <ebotcazou@adacore.com>
-
-       * trans.c (convert_with_check): Update call to real_2expN.
+       * raise-gcc.c (get_region_description_for, get_call_site_action_for,
+       get_action_description_for): Replace _Unwind_Word with _uleb128_t 
+       and _Unwind_SWord with _sleb128_t.
 
 2007-09-06  Eric Botcazou  <ebotcazou@adacore.com>
 
@@ -1011,7 +1005,7 @@
        (build_global_cdtor): Delete.
        (gnat_write_global_declarations): Do not call build_global_cdtor.
 
-       * lang-specs.h: If TARGET_VXWORKS_RTP is defined, append -mrtp when
+       * lang-spARGET_VXWORKS_RTP is defined, append -mrtp when
        -fRTS=rtp is specified.
        If CONFIG_DUAL_EXCEPTIONS is 1, append -fsjlj when -fRTS=sjlj is
        specified.

diff --git a/gcc/ada/raise-gcc.c b/gcc/ada/raise-gcc.c
index 55371d57b7eb3952145fd99301ac34a245c2c832..8a7cf5a568f5b3acba113ccca77505eaba6c7e49 100644 (file)
--- a/gcc/ada/raise-gcc.c
+++ b/gcc/ada/raise-gcc.c
@@ -540,7 +540,7 @@ get_region_description_for (_Unwind_Context *uw_context,
                             region_descriptor *region)
 {
   const unsigned char * p;
-  _Unwind_Word tmp;
+  _uleb128_t tmp;
   unsigned char lpbase_encoding;
 
   /* Get the base address of the lsda information. If the provided context
@@ -705,7 +705,7 @@ get_call_site_action_for (_Unwind_Context *uw_context,
     }
   else
     {
-      _Unwind_Word cs_lp, cs_action;
+      _uleb128_t cs_lp, cs_action;
 
       /* Let the caller know there may be an action to take, but let it
         determine the kind.  */
@@ -765,7 +765,7 @@ get_call_site_action_for (_Unwind_Context *uw_context,
   while (p < region->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, region->call_site_encoding, p, &cs_start);
@@ -913,7 +913,7 @@ get_action_description_for (_Unwind_Context *uw_context,
     {
       const unsigned char * p = action->table_entry;
 
-      _Unwind_Sword ar_filter, ar_disp;
+      _sleb128_t ar_filter, ar_disp;
 
       action->kind = nothing;