From 0b1d7060b5971207d0cb09d58ca363c943805768 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Sun, 20 Sep 2009 11:03:33 +0000 Subject: [PATCH] unwind-dw2-fde.c (classify_object_over_fdes): Cast the constant 1 to _Unwind_Ptr. 2009-09-20 Kai Tietz Pascal Obry * unwind-dw2-fde.c (classify_object_over_fdes): Cast the constant 1 to _Unwind_Ptr. (add_fdes): Likewise. (linear_search_fdes): Likewise. Co-Authored-By: Pascal Obry From-SVN: r151899 --- gcc/ChangeLog | 8 ++++++++ gcc/unwind-dw2-fde.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fceb9678755..361484a7b2d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2009-09-20 Kai Tietz + Pascal Obry + + * 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 * stor-layout.c (set_sizetype): Avoid useless type copy. diff --git a/gcc/unwind-dw2-fde.c b/gcc/unwind-dw2-fde.c index 4aa9d82af8d..60535cfd780 100644 --- 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 *)) - mask = (1L << (mask << 3)) - 1; + mask = (((_Unwind_Ptr) 1) << (mask << 3)) - 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 *)) - mask = (1L << (mask << 3)) - 1; + mask = (((_Unwind_Ptr) 1) << (mask << 3)) - 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 *)) - mask = (1L << (mask << 3)) - 1; + mask = (((_Unwind_Ptr) 1) << (mask << 3)) - 1; else mask = -1;