From 693ed633816d191104a804686043a02146c34d8e Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Wed, 10 Aug 2011 08:40:17 +0000 Subject: [PATCH] jcf-dump.c (print_constant): Cast first frexp arg. gcc/java: * jcf-dump.c (print_constant): Cast first frexp arg. libjava: * exception.cc (std::abort): Remove static. From-SVN: r177612 --- gcc/java/ChangeLog | 4 ++++ gcc/java/jcf-dump.c | 4 ++-- libjava/ChangeLog | 4 ++++ libjava/exception.cc | 5 +++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 21d29e4b26f..11515f0fa84 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2011-08-10 Rainer Orth + + * jcf-dump.c (print_constant): Cast first frexp arg. + 2011-08-08 Rainer Orth * Make-lang.in ($(XGCJ)$(exeext)): Add $(EXTRA_GCC_LIBS). diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c index 6a2714c1205..fecca155db1 100644 --- a/gcc/java/jcf-dump.c +++ b/gcc/java/jcf-dump.c @@ -790,7 +790,7 @@ print_constant (FILE *out, JCF *jcf, int index, int verbosity) /* Normal; add the implicit bit. */ mantissa |= ((uint32)1 << 23); - f = frexp (mantissa, &dummy); + f = frexp ((float) mantissa, &dummy); f = ldexp (f, exponent + 1); fprintf (out, "%.10g", f); } @@ -833,7 +833,7 @@ print_constant (FILE *out, JCF *jcf, int index, int verbosity) /* Normal; add the implicit bit. */ mantissa |= ((uint64)1 << 52); - d = frexp (mantissa, &dummy); + d = frexp ((double) mantissa, &dummy); d = ldexp (d, exponent + 1); fprintf (out, "%.20g", d); } 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 + + * exception.cc (std::abort): Remove static. + 2011-08-08 Rainer Orth * 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 (); -- 2.30.2