From 2faa2958b5235c9921f25ccbb3147ca17ea3dc50 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@gnu.org>
Date: Fri, 29 Apr 2005 14:00:03 +0000
Subject: 2005-04-29  Paolo Bonzini  <bonzini@gnu.org>

	Sync from gcc:

	2005-04-22  Bernd Schmidt  <bernd.schmidt@analog.com>

        * config.sub: Update from master copy.

	2005-04-19  Hans-Peter Nilsson  <hp@axis.com>

        * configure.in <crisv32-*-*, cris-*-*>: New local variable
        libgcj_ex_libffi.  Have specific match for *-*-linux*.  Separate
        matches for "*-*-aout" and "*-*-elf".  Don't disable libffi for
        "*-*-elf" and "*-*-linux*".
        * configure: Regenerate.

config:
2005-04-29  Paolo Bonzini  <bonzini@gnu.org>

	* acx.m4 (ACX_PROG_GNAT): Remove stray break.
---
 configure.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 64dad1b9f0f..70b833321ec 100644
--- a/configure.in
+++ b/configure.in
@@ -481,9 +481,14 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib"
     ;;
   cris-*-* | crisv32-*-*)
+    libgcj_ex_libffi=`echo ${libgcj} | sed -e 's/target-libffi//'`
     case "${target}" in
-      *-*-elf | *-*-aout)
+      *-*-aout)
 	noconfigdirs="$noconfigdirs ${libgcj}";;
+      *-*-elf)
+	noconfigdirs="$noconfigdirs ${libgcj_ex_libffi}";;
+      *-*-linux*)
+	noconfigdirs="$noconfigdirs ${libgcj_ex_libffi} target-newlib target-libgloss";;
       *)
 	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
     esac
-- 
cgit v1.2.1