This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH to conditionalize signal handling


I cleaned up some warnings when I was working on the MinGW port.
I rather belatedly checked them into mainline.
--
	--Per Bothner
per@bothner.com   http://per.bothner.com/

Index: prims.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/prims.cc,v
retrieving revision 1.97
diff -u -p -r1.97 prims.cc
--- prims.cc	23 Aug 2004 21:31:53 -0000	1.97
+++ prims.cc	26 Sep 2004 15:19:49 -0000
@@ -125,10 +125,11 @@ void (*_Jv_JVMPI_Notify_THREAD_END) (JVM
 #endif
 
 
+#if defined (HANDLE_SEGV) || defined(HANDLE_FPE)
 /* Unblock a signal.  Unless we do this, the signal may only be sent
    once.  */
 static void 
-unblock_signal (int signum)
+unblock_signal (int signum __attribute__ ((__unused__)))
 {
 #ifdef _POSIX_VERSION
   sigset_t sigs;
@@ -138,6 +139,7 @@ unblock_signal (int signum)
   sigprocmask (SIG_UNBLOCK, &sigs, NULL);
 #endif
 }
+#endif
 
 #ifdef HANDLE_SEGV
 SIGNAL_HANDLER (catch_segv)
2004-09-26  Per Bothner  <per@bothner.com>

	* prims.cc (unblock_signal): Annotate signum with __unused__ to
	avoid warnings in the non-POSIX_VERSION case.
	Also, we only need this function if either HANDLE_SEGV or HANDLE_FPE,
	so place it inside an #if block.
	* include/default-signal.h (SIGNAL_HANDLER): Parameters are __unused__.
	* include/i386-signal.h (SIGNAL_HANDLER):  Likewise
	* include/mips-signal.h (SIGNAL_HANDLER):  Likewise
	* include/sparc-signal.h (SIGNAL_HANDLER):  Likewise

Index: include/default-signal.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/default-signal.h,v
retrieving revision 1.8
diff -u -p -r1.8 default-signal.h
--- include/default-signal.h	13 Jun 2003 12:20:45 -0000	1.8
+++ include/default-signal.h	26 Sep 2004 15:19:50 -0000
@@ -19,7 +19,7 @@ details.  */
 #include <signal.h>
 
 #define SIGNAL_HANDLER(_name)			\
-static void _name (int _dummy)
+static void _name (int _dummy __attribute__ ((__unused__)))
 
 #define INIT_SEGV						\
 do								\
Index: include/i386-signal.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/i386-signal.h,v
retrieving revision 1.18
diff -u -p -r1.18 i386-signal.h
--- include/i386-signal.h	8 Feb 2004 17:13:50 -0000	1.18
+++ include/i386-signal.h	26 Sep 2004 15:19:50 -0000
@@ -20,7 +20,7 @@ details.  */
 #define HANDLE_FPE 1
 
 #define SIGNAL_HANDLER(_name)	\
-static void _name (int _dummy)
+static void _name (int _dummy __attribute__ ((__unused__)))
 
 #define MAKE_THROW_FRAME(_exception)					\
 do									\
Index: include/mips-signal.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/mips-signal.h,v
retrieving revision 1.3
diff -u -p -r1.3 mips-signal.h
--- include/mips-signal.h	3 Sep 2004 19:08:47 -0000	1.3
+++ include/mips-signal.h	26 Sep 2004 15:19:50 -0000
@@ -54,7 +54,9 @@ struct kernel_sigaction {
 
 
 #define SIGNAL_HANDLER(_name) \
-static void _name (int _dummy, siginfo_t *_info, sig_ucontext_t *_arg)
+static void _name (int _dummy __attribute__ ((__unused__)), \
+		   siginfo_t *_info __attribute__ ((__unused__)), \
+		   sig_ucontext_t *_arg __attribute__ ((__unused__)))
 
 /*
  *  MIPS leaves pc pointing at the faulting instruction, but the
Index: include/sparc-signal.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/sparc-signal.h,v
retrieving revision 1.9
diff -u -p -r1.9 sparc-signal.h
--- include/sparc-signal.h	13 Jun 2003 12:20:45 -0000	1.9
+++ include/sparc-signal.h	26 Sep 2004 15:19:50 -0000
@@ -18,7 +18,9 @@ details.  */
 #define HANDLE_FPE 1
 
 #define SIGNAL_HANDLER(_name) 						\
-static void _name (int _dummy, siginfo_t *_info, void *arg)
+static void _name (int _dummy __attribute__ ((__unused__)), \
+		   siginfo_t *_info __attribute__ ((__unused__)), \
+		   void *arg __attribute__ ((__unused__)))
 
 #ifdef __arch64__
 #define FLUSH_REGISTER_WINDOWS					\

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]