2009-09-20 Kai Tietz <kai.tietz@onevision.com>

            Pascal Obry  <obry@adacore.com>

        * unwind-dw2-fde.c (classify_object_over_fdes):
        Cast the constant 1 to _Unwind_Ptr.
        (add_fdes): Likewise.
        (linear_search_fdes): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151899 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fceb967..361484a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-20  Kai Tietz  <kai.tietz@onevision.com>
+           Pascal Obry  <obry@adacore.com>
+
+       * unwind-dw2-fde.c (classify_object_over_fdes):
+       Cast the constant 1 to _Unwind_Ptr.
+       (add_fdes): Likewise.
+       (linear_search_fdes): Likewise.
+

 2009-09-20  Eric Botcazou  <ebotcazou@adacore.com>
 
        * stor-layout.c (set_sizetype): Avoid useless type copy.
 2009-09-20  Eric Botcazou  <ebotcazou@adacore.com>
 
        * stor-layout.c (set_sizetype): Avoid useless type copy.

diff --git a/gcc/unwind-dw2-fde.c b/gcc/unwind-dw2-fde.c
index 4aa9d82..60535cf 100644 (file)
--- a/gcc/unwind-dw2-fde.c
+++ b/gcc/unwind-dw2-fde.c
@@ -630,7 +630,7 @@ classify_object_over_fdes (struct object *ob, const fde *this_fde)
         be representable.  Assume 0 in the representable bits is NULL.  */
       mask = size_of_encoded_value (encoding);
       if (mask < sizeof (void *))
         be representable.  Assume 0 in the representable bits is NULL.  */
       mask = size_of_encoded_value (encoding);
       if (mask < sizeof (void *))

-       mask = (1L << (mask << 3)) - 1;
+       mask = (((_Unwind_Ptr) 1) << (mask << 3)) - 1;

       else
        mask = -1;
 
       else
        mask = -1;
 


@@ -693,7 +693,7 @@ add_fdes (struct object *ob, struct fde_accumulator *accu, const fde *this_fde)
             be representable.  Assume 0 in the representable bits is NULL.  */
          mask = size_of_encoded_value (encoding);
          if (mask < sizeof (void *))
             be representable.  Assume 0 in the representable bits is NULL.  */
          mask = size_of_encoded_value (encoding);
          if (mask < sizeof (void *))

-           mask = (1L << (mask << 3)) - 1;
+           mask = (((_Unwind_Ptr) 1) << (mask << 3)) - 1;

          else
            mask = -1;
 
          else
            mask = -1;
 


@@ -816,7 +816,7 @@ linear_search_fdes (struct object *ob, const fde *this_fde, void *pc)
             be representable.  Assume 0 in the representable bits is NULL.  */
          mask = size_of_encoded_value (encoding);
          if (mask < sizeof (void *))
             be representable.  Assume 0 in the representable bits is NULL.  */
          mask = size_of_encoded_value (encoding);
          if (mask < sizeof (void *))

-           mask = (1L << (mask << 3)) - 1;
+           mask = (((_Unwind_Ptr) 1) << (mask << 3)) - 1;

          else
            mask = -1;
 
          else
            mask = -1;