aboutsummaryrefslogtreecommitdiff
path: root/libjava/include
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2011-12-20 12:18:26 +0000
committerRainer Orth <ro@gcc.gnu.org>2011-12-20 12:18:26 +0000
commit08b2f8e637423f97ef11f8fca86bf2cb8d5cffa6 (patch)
treef0c689c13661dd36f66a7862b77fe4b80b1df008 /libjava/include
parent6b302f97203aa825fd0e46feecdd2cee47f54e75 (diff)
downloadgcc-08b2f8e637423f97ef11f8fca86bf2cb8d5cffa6.zip
gcc-08b2f8e637423f97ef11f8fca86bf2cb8d5cffa6.tar.gz
gcc-08b2f8e637423f97ef11f8fca86bf2cb8d5cffa6.tar.bz2
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
Diffstat (limited to 'libjava/include')
-rw-r--r--libjava/include/i386-signal.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/libjava/include/i386-signal.h b/libjava/include/i386-signal.h
index a3d3a1b..c2409b0 100644
--- 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__ */