FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
This commit is contained in:
Rainer Orth 2011-12-20 12:18:26 +00:00 • committed by Rainer Orth
parent 6b302f9720
commit 08b2f8e637
4 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libjava/ChangeLog
View file

@ -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

1
libjava/configure vendored
View file

@ -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

1
libjava/configure.ac
View file

@ -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

13
libjava/include/i386-signal.h
View file

@ -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__ */