diff options
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/libjava/configure b/libjava/configure index f28388d..a108f72 100755 --- a/libjava/configure +++ b/libjava/configure @@ -5118,24 +5118,33 @@ done test -n "$PERL" || PERL="false" -if test "$enable_sjlj_exceptions" = yes; then +SYSDEP_SOURCES= + +case "${host}" in + i?86-*-linux*) + SIGNAL_HANDLER=include/i386-signal.h + ;; + sparc-sun-solaris*) + SIGNAL_HANDLER=include/sparc-signal.h + ;; + ia64-*) + SYSDEP_SOURCES=sysdep/ia64.c + test -d sysdep || mkdir sysdep + ;; + *) + SIGNAL_HANDLER=include/default-signal.h + ;; +esac + +# If we're using sjlj exceptions, forget what we just learned. +if test "$libgcj_sjlj" = yes; then SIGNAL_HANDLER=include/default-signal.h -else - case "${host}" in - i?86-*-linux*) - SIGNAL_HANDLER=include/i386-signal.h - ;; - sparc-sun-solaris*) - SIGNAL_HANDLER=include/sparc-signal.h - ;; - *) - SIGNAL_HANDLER=include/default-signal.h - ;; - esac fi + + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" else @@ -5367,6 +5376,7 @@ s%@EH_COMMON_INCLUDE@%$EH_COMMON_INCLUDE%g s%@AM_RUNTESTFLAGS@%$AM_RUNTESTFLAGS%g s%@ALLOCA@%$ALLOCA%g s%@PERL@%$PERL%g +s%@SYSDEP_SOURCES@%$SYSDEP_SOURCES%g s%@here@%$here%g CEOF |