X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2Fexception.cc;h=d983f98f8faaaaff3cb9d269c3f78de990caf1fd;hb=980dba51c0e5bd44ddc9b2429710fa8eefc4898b;hp=5d1f28886d55f7adeda8c539bff4a111cef21257;hpb=2fc87a25080a48e582613906aa95010b6b47deb0;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libjava/exception.cc b/libjava/exception.cc
index 5d1f28886d5..d983f98f8fa 100644
--- a/libjava/exception.cc
+++ b/libjava/exception.cc
@@ -1,6 +1,6 @@
 // Functions for Exception Support for Java.
 
-/* Copyright (C) 1998, 1999, 2001  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2001, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -23,7 +23,8 @@ details.  */
 // stdlib.h's abort().
 namespace std
 {
-  void abort ()
+  static __attribute__ ((__noreturn__)) void
+  abort ()
   {
     ::abort ();
   }
@@ -337,7 +338,7 @@ PERSONALITY_FUNCTION (int version,
 	      // The catch_type is either a (java::lang::Class*) or
 	      // is one more than a (Utf8Const*).
 	      if ((size_t)catch_type & 1)
-		catch_type = _Jv_FindClass ((Utf8Const*)catch_type - 1, NULL);
+		catch_type = _Jv_FindClass ((Utf8Const*)((size_t)catch_type ^ 1), NULL);
 
 	      if (_Jv_IsInstanceOf (xh->value, catch_type))
 		{