X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Funwind-c.c;h=86b9f55704819fd2b712196cd464d14981b162ee;hb=5632bff570a3489804e448af25abf1db374c6762;hp=f287ea2d9e628fc2ffcf95d24eb8c2d297e2641f;hpb=c68b099b2ab366fad3aec65eb17aefd1d9560d75;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/unwind-c.c b/gcc/unwind-c.c
index f287ea2d9e6..86b9f557048 100644
--- a/gcc/unwind-c.c
+++ b/gcc/unwind-c.c
@@ -1,5 +1,5 @@
 /* Supporting functions for C exception handling.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc.
    Contributed by Aldy Hernandez <aldy@quesejoda.com>.
    Shamelessly stolen from the Java front end.
 
@@ -7,27 +7,22 @@ This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later
 version.
 
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file.  (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combined
-executable.)
-
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
 
 #include "tconfig.h"
 #include "tsystem.h"
@@ -125,7 +120,7 @@ PERSONALITY_FUNCTION (int version,
 #endif
 {
   lsda_header_info info;
-  const unsigned char *language_specific_data, *p, *action_record;
+  const unsigned char *language_specific_data, *p;
   _Unwind_Ptr landing_pad, ip;
   int ip_before_insn = 0;
 
@@ -186,8 +181,6 @@ PERSONALITY_FUNCTION (int version,
       /* Can never have null landing pad for sjlj -- that would have
 	 been indicated by a -1 call site index.  */
       landing_pad = (_Unwind_Ptr)cs_lp + 1;
-      if (cs_action)
-	action_record = info.action_table + cs_action - 1;
       goto found_something;
     }
 #else
@@ -210,8 +203,6 @@ PERSONALITY_FUNCTION (int version,
 	{
 	  if (cs_lp)
 	    landing_pad = info.LPStart + cs_lp;
-	  if (cs_action)
-	    action_record = info.action_table + cs_action - 1;
 	  goto found_something;
 	}
     }