Support 64-bit libjava multilib for i?86-linux

	* configure.ac (i?86-*-linux*): Set SIGNAL_HANDLER_AUX.
	* configure: Regenerate.
	* include/i386-signal.h: Wrap in __i386__, include
	java-signal-aux.h otherwise.

From-SVN: r182528

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 08d4faa1314c5e458e890e2a96b6989ff3c9a8b9..42787e1e896151b4e989bdea07d89ee121e3d414 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-20  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * configure.ac (i?86-*-linux*): Set SIGNAL_HANDLER_AUX.
+       * configure: Regenerate.
+       * include/i386-signal.h: Wrap in __i386__, include
+       java-signal-aux.h otherwise.
+
 2011-12-12  Kai Tietz  <ktietz@redhat.com>
 
        PR libgcj/50053

diff --git a/libjava/configure b/libjava/configure
index e6c5b0cf66c42fe4073c6505d9198a2a7db181ca..2bce6894075b74927861c137037c1d3e4f9d089b 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -24225,6 +24225,7 @@ case "${host}" in
     ;;
  i?86-*-linux*)
     SIGNAL_HANDLER=include/i386-signal.h
+    SIGNAL_HANDLER_AUX=include/x86_64-signal.h
     ;;
 # ia64-*)
 #    SYSDEP_SOURCES=sysdep/ia64.c

diff --git a/libjava/configure.ac b/libjava/configure.ac
index d308c4f1a6bfb1df05a36b980358d22613e9b465..b2b6925204f2bef333b19d59489ac483132cdfc7 100644 (file)
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1737,6 +1737,7 @@ case "${host}" in
     ;;
  i?86-*-linux*)
     SIGNAL_HANDLER=include/i386-signal.h
+    SIGNAL_HANDLER_AUX=include/x86_64-signal.h
     ;;
 # ia64-*)
 #    SYSDEP_SOURCES=sysdep/ia64.c

diff --git a/libjava/include/i386-signal.h b/libjava/include/i386-signal.h
index a3d3a1b75f094e4dce5c0c7a7958a73b448b036a..c2409b0e30101b51624d7ee4d2c8aec5eb9ebdda 100644 (file)
--- a/libjava/include/i386-signal.h
+++ b/libjava/include/i386-signal.h
@@ -1,7 +1,8 @@
 // i386-signal.h - Catch runtime signals and turn them into exceptions
 // on an i386 based Linux system.
 
-/* Copyright (C) 1998, 1999, 2001, 2002, 2006, 2007  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2001, 2002, 2006, 2007, 2011
+   Free Software Foundation
 
    This file is part of libgcj.
 
@@ -10,6 +11,8 @@ Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
 
+#ifdef __i386__
+
 #ifndef JAVA_SIGNAL_H
 #define JAVA_SIGNAL_H 1
 
@@ -165,3 +168,11 @@ while (0)
 
 #endif /* JAVA_SIGNAL_H */
   
+#else /* __i386__ */
+
+/* This is for the 64-bit subsystem on i386.  */
+
+#define sigcontext_struct sigcontext
+#include <java-signal-aux.h>
+
+#endif /* __i386__ */