Patchwork [libjava] : Cleanup include/dwarf2-signal.h to avoid several warnings

login
register
mail settings
Submitter Uros Bizjak
Date March 12, 2014, 11:18 a.m.
Message ID <CAFULd4aZnyHC5_U-mG_VVswjfX5dk3R_0_JXiDfWE3Sp0PsQVg@mail.gmail.com>
Download mbox | patch
Permalink /patch/329400/
State New
Headers show

Comments

Uros Bizjak - March 12, 2014, 11:18 a.m.
Hello!

Attached patch cleans include/dwarf2-signal.h to avoid

./include/java-signal.h:26:19: warning: declaration 'class
java::lang::Throwable' does not declare anything
./include/java-signal.h:24:42: warning: unused parameter '_sip'
[-Wunused-parameter]
./include/java-signal.h:26:19: warning: declaration 'class
java::lang::Throwable' does not declare anything
./include/java-signal.h:26:19: warning: declaration 'class
java::lang::Throwable' does not declare anything

on alpha-pc-linux-gnu build. The SIGNAL_HANDLER change is taken from
x86_64-signal.h header and allows empty definition of
MAKE_THROW_FRAME.

2014-03-12  Uros Bizjak  <ubizjak@gmail.com>

    * include/dwarf2-signal.h: Update copyright year.
    (SIGNAL_HANDLER): Remove _sip argument.  Mark _p argument with
    __attribute__ ((__unused__)).
    (class java::lang::Throwable): Remove declaration.
    (MAKE_THROW_FRAME) [!__ia64__]: Define as empty definition.

Patch was bootstrapped and regression tested on alpha-pc-linux-gnu and
is committed to mainline SVN under obvious rule.

Uros.

Patch

Index: include/dwarf2-signal.h
===================================================================
--- include/dwarf2-signal.h	(revision 208493)
+++ include/dwarf2-signal.h	(working copy)
@@ -1,6 +1,6 @@ 
 // dwarf2-signal.h - Catch runtime signals and turn them into exceptions.
 
-/* Copyright (C) 2000, 2001, 2009, 2011  Free Software Foundation
+/* Copyright (C) 2000, 2001, 2009, 2011, 2014  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -20,11 +20,10 @@  details.  */
 #define HANDLE_SEGV 1
 #undef HANDLE_FPE
 
-#define SIGNAL_HANDLER(_name)	\
-static void _Jv_##_name (int, siginfo_t *_sip, void *_p)
+#define SIGNAL_HANDLER(_name)					\
+static void _Jv_##_name (int, siginfo_t *,			\
+			 void *_p __attribute__ ((__unused__)))
 
-class java::lang::Throwable;
-
 // Unwind the stack to the point at which the signal was generated and
 // then throw an exception.  With the dwarf2 unwinder we don't usually
 // need to do anything, with some minor exceptions.
@@ -47,12 +46,7 @@  do									\
 while (0)
 
 #else
-#define MAKE_THROW_FRAME(_exception)		\
-do						\
-{						\
-  (void)_p;					\
-}						\
-while (0)
+#define MAKE_THROW_FRAME(_exception)
 #endif
 
 #if defined(__sparc__)