diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-25 19:29:43 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-25 19:29:43 +0000 |
| commit | 46dfcc3ee85a4a02abce4d45ee619f240c116af6 (patch) | |
| tree | 6c3dc3d53cd17d62447673b81abbcfc69bacd2f3 /libjava/exception.cc | |
| parent | 2a8624373adc103f943e22e781c2d6fadb828eae (diff) | |
| download | gcc-46dfcc3ee85a4a02abce4d45ee619f240c116af6.tar.gz | |
2011-08-25 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 178073 using svnmerge.
2011-08-25 Basile Starynkevitch <basile@starynkevitch.net>
* gcc/melt-runtime.c (melt_linemap_compute_current_location): Use the
linemap_position_for_column function for GCC 4.7 when merging with
GCC trunk rev 178073.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@178087 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/exception.cc')
| -rw-r--r-- | libjava/exception.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libjava/exception.cc b/libjava/exception.cc index 76f145112ff..5a8a9e21cfa 100644 --- a/libjava/exception.cc +++ b/libjava/exception.cc @@ -1,6 +1,7 @@ // Functions for Exception Support for Java. -/* Copyright (C) 1998, 1999, 2001, 2002, 2006, 2010 Free Software Foundation +/* Copyright (C) 1998, 1999, 2001, 2002, 2006, 2010, 2011 + Free Software Foundation This file is part of libgcj. @@ -24,7 +25,7 @@ details. */ // stdlib.h's abort(). namespace std { - static __attribute__ ((__noreturn__)) void + __attribute__ ((__noreturn__)) void abort () { ::abort (); |