diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-21 09:07:52 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-21 09:07:52 +0000 |
| commit | c376c8d3136602addba5a4e49dcc3f920999069e (patch) | |
| tree | 46f42fd6a5ffbbc0708e3f6c9dbb4f490f663b39 /libjava | |
| parent | 4a5d167df1662b4f709186178aa8ab842dd87a8b (diff) | |
| download | gcc-c376c8d3136602addba5a4e49dcc3f920999069e.tar.gz | |
2011-12-21 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 182564 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@182569 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rwxr-xr-x | libjava/configure | 1 | ||||
| -rw-r--r-- | libjava/configure.ac | 1 | ||||
| -rw-r--r-- | libjava/include/i386-signal.h | 13 |
4 files changed, 21 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 08d4faa1314..42787e1e896 100644 --- 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 e6c5b0cf66c..2bce6894075 100755 --- 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 d308c4f1a6b..b2b6925204f 100644 --- 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 a3d3a1b75f0..c2409b0e301 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__ */ |