summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2011-08-10 08:40:17 +0000
committerro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2011-08-10 08:40:17 +0000
commitdf2fb932d638d917d47dfd4b8e666aea6f450d4b (patch)
treedafd0d203a4bfbc0ecee6ba042e5137667ee6c68 /libjava
parent0e3f4c53c7c177276277c47b5aa259fa4ff7fd18 (diff)
downloadgcc-df2fb932d638d917d47dfd4b8e666aea6f450d4b.tar.gz
gcc/java:
* jcf-dump.c (print_constant): Cast first frexp arg. libjava: * exception.cc (std::abort): Remove static. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177612 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/exception.cc5
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8af4a5faea7..53adfd45285 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * exception.cc (std::abort): Remove static.
+
2011-08-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure.ac (THREADS): Remove posix95.
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 ();