This is the mail archive of the java-patches@sourceware.cygnus.com mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Patch: Standard comformant arithmetic


This is a patch for some problems we've been having for a while.

Firstly, we don't check division by zero, and instead rely on the
run-time environment to trap when division by zero occurs.  To fix
this, I've added a new compiler option, -fuse-divide-subroutine, which
instead of generating divide insns calls a subroutine in libgcj.  This
option is not intended to be passed by the user, but in the
libgcj.spec file which is created when libgcj is installed.

An unfortunate side effect of this is that the libgcj.spec file is now
required at compile time as well as at link time.  I don't know if
this will be a problem for anyone.

Secondly, conversions from floating-point to integer were broken: they
didn't conform to the Java Language Spec.  In order to solve this I've
added extra fp conversion logic which is strictly Java language
compliant.  This will result in code bloat and slow execution, but
it's necessary for Java Language compliance and may be disabled by
-fast-math.

I have applied this patch.

There is an accompanying required gcj patch.

Andrew.

1999-07-19  Andrew Haley  <aph@cygnus.com>

        * prims.cc (JvRunMain): Always initialize arithexception.
        (_Jv_divI): New function.
        (_Jv_remI): New function.
        (_Jv_divJ): New function.
        (_Jv_remI): New function.
        * include/jvm.h: Add these new functions.

        Makefile.am: add DIVIDESPEC.
        aclocal.m4: ditto.
        configure.host: set DIVIDESPEC.
        libgcj.spec.in: pass DIVIDESPEC to compiler.
        configure: rebuilt.
        Makefile.in: rebuilt.

Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.24
diff -p -2 -c -r1.24 Makefile.am
*** Makefile.am	1999/06/21 13:03:44	1.24
--- Makefile.am	1999/07/21 15:03:32
*************** INCLUDES = -Iinclude -I$(top_srcdir)/inc
*** 81,84 ****
--- 81,86 ----
  	$(EH_COMMON_INCLUDE) $(ZINCS)
  
+ DIVIDESPEC = @DIVIDESPEC@
+ 
  
  ## ################################################################
Index: Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.in,v
retrieving revision 1.26
diff -p -2 -c -r1.26 Makefile.in
*** Makefile.in	1999/06/21 13:03:45	1.26
--- Makefile.in	1999/07/21 15:03:33
*************** INCLUDES = -Iinclude -I$(top_srcdir)/inc
*** 161,164 ****
--- 161,166 ----
  
  
+ DIVIDESPEC = @DIVIDESPEC@
+ 
  nat_files = $(nat_source_files:.cc=.lo)
  c_files = $(c_source_files:.c=.lo)
Index: aclocal.m4
===================================================================
RCS file: /cvs/java/libgcj/libjava/aclocal.m4,v
retrieving revision 1.4
diff -p -2 -c -r1.4 aclocal.m4
*** aclocal.m4	1999/05/19 12:55:13	1.4
--- aclocal.m4	1999/07/21 15:03:33
*************** AC_SUBST(LIBGCJ_CFLAGS)
*** 168,171 ****
--- 168,174 ----
  AC_SUBST(LIBGCJ_CXXFLAGS)
  AC_SUBST(LIBGCJ_JAVAFLAGS)
+ 
+ AC_SUBST(DIVIDESPEC)
+ 
  ])dnl
  
Index: configure
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure,v
retrieving revision 1.14
diff -p -2 -c -r1.14 configure
*** configure	1999/07/02 18:50:17	1.14
--- configure	1999/07/21 15:03:34
*************** LIBGCJ_JAVAFLAGS="${libgcj_javaflags}"
*** 1594,1597 ****
--- 1594,1600 ----
  
  
+ 
+ 
+ 
  # Check whether --enable-shared or --disable-shared was given.
  if test "${enable_shared+set}" = set; then
*************** fi
*** 1666,1670 ****
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1669: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1669,1673 ----
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1672: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** fi
*** 1696,1700 ****
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1699: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1699,1703 ----
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1702: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** if test -z "$CC"; then
*** 1726,1730 ****
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1729: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1729,1733 ----
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1732: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** fi
*** 1777,1781 ****
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1780: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1780,1784 ----
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1783: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** fi
*** 1809,1813 ****
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1812: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
--- 1812,1816 ----
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1815: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
*************** cross_compiling=$ac_cv_prog_cc_cross
*** 1820,1829 ****
  cat > conftest.$ac_ext << EOF
  
! #line 1823 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
! if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
--- 1823,1832 ----
  cat > conftest.$ac_ext << EOF
  
! #line 1826 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
! if { (eval echo configure:1831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
*************** if test $ac_cv_prog_cc_works = no; then
*** 1851,1860 ****
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1854: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1859: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1854,1863 ----
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1857: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1862: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 1865,1869 ****
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
--- 1868,1872 ----
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
*************** ac_save_CFLAGS="$CFLAGS"
*** 1884,1888 ****
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1887: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1887,1891 ----
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1890: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** if test "$ac_cv_prog_gcc" = yes; then
*** 1927,1931 ****
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
! echo "configure:1930: checking for ld used by GCC" >&5
    ac_prog=`($CC -print-prog-name=ld) 2>&5`
    case "$ac_prog" in
--- 1930,1934 ----
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
! echo "configure:1933: checking for ld used by GCC" >&5
    ac_prog=`($CC -print-prog-name=ld) 2>&5`
    case "$ac_prog" in
*************** echo "configure:1930: checking for ld us
*** 1951,1958 ****
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
! echo "configure:1954: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
! echo "configure:1957: checking for non-GNU ld" >&5
  fi
  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
--- 1954,1961 ----
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
! echo "configure:1957: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
! echo "configure:1960: checking for non-GNU ld" >&5
  fi
  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
*************** test -z "$LD" && { echo "configure: erro
*** 1990,1994 ****
  
  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
! echo "configure:1993: checking if the linker ($LD) is GNU ld" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1993,1997 ----
  
  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
! echo "configure:1996: checking if the linker ($LD) is GNU ld" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
*** 2006,2010 ****
  
  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
! echo "configure:2009: checking for BSD-compatible nm" >&5
  if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2009,2013 ----
  
  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
! echo "configure:2012: checking for BSD-compatible nm" >&5
  if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** echo "$ac_t""$NM" 1>&6
*** 2044,2048 ****
  # Check for command to grab the raw symbol name followed by C symbol from nm.
  echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
! echo "configure:2047: checking command to parse $NM output" >&5
  if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2047,2051 ----
  # Check for command to grab the raw symbol name followed by C symbol from nm.
  echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
! echo "configure:2050: checking command to parse $NM output" >&5
  if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** int main(){nm_test_var='a';nm_test_func;
*** 2107,2115 ****
  EOF
  
!   if { (eval echo configure:2110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      # Now try to grab the symbols.
      ac_nlist=conftest.nm
    
!     if { (eval echo configure:2114: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
  
        # Try sorting and uniquifying the output.
--- 2110,2118 ----
  EOF
  
!   if { (eval echo configure:2113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      # Now try to grab the symbols.
      ac_nlist=conftest.nm
    
!     if { (eval echo configure:2117: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
  
        # Try sorting and uniquifying the output.
*************** EOF
*** 2163,2167 ****
  	  LIBS="conftestm.$ac_objext"
  	  CFLAGS="$CFLAGS$no_builtin_flag"
! 	  if { (eval echo configure:2166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  	    ac_pipe_works=yes
  	  else
--- 2166,2170 ----
  	  LIBS="conftestm.$ac_objext"
  	  CFLAGS="$CFLAGS$no_builtin_flag"
! 	  if { (eval echo configure:2169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  	    ac_pipe_works=yes
  	  else
*************** echo "$ac_t""$ac_result" 1>&6
*** 2209,2213 ****
  
  echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
! echo "configure:2212: checking for _ prefix in compiled symbols" >&5
  if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2212,2216 ----
  
  echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
! echo "configure:2215: checking for _ prefix in compiled symbols" >&5
  if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** void nm_test_func(){}
*** 2218,2225 ****
  int main(){nm_test_func;return 0;}
  EOF
! if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    # Now try to grab the symbols.
    ac_nlist=conftest.nm
!   if { (eval echo configure:2224: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
      # See whether the symbols have a leading underscore.
      if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
--- 2221,2228 ----
  int main(){nm_test_func;return 0;}
  EOF
! if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    # Now try to grab the symbols.
    ac_nlist=conftest.nm
!   if { (eval echo configure:2227: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
      # See whether the symbols have a leading underscore.
      if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
*************** USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol
*** 2247,2251 ****
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:2250: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2250,2254 ----
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:2253: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** case "$host" in
*** 2283,2288 ****
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 2286 "configure"' > conftest.$ac_ext
!   if { (eval echo configure:2287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
--- 2286,2291 ----
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 2289 "configure"' > conftest.$ac_ext
!   if { (eval echo configure:2290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
*************** case "$host" in
*** 2305,2314 ****
    CFLAGS="$CFLAGS -belf"
    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
! echo "configure:2308: checking whether the C compiler needs -belf" >&5
  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2313 "configure"
  #include "confdefs.h"
  
--- 2308,2317 ----
    CFLAGS="$CFLAGS -belf"
    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
! echo "configure:2311: checking whether the C compiler needs -belf" >&5
  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2316 "configure"
  #include "confdefs.h"
  
*************** int main() {
*** 2317,2321 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    lt_cv_cc_needs_belf=yes
--- 2320,2324 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    lt_cv_cc_needs_belf=yes
*************** echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
*** 2340,2344 ****
  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2343: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2343,2347 ----
  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2346: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** if test -n "$ac_tool_prefix"; then
*** 2372,2376 ****
  set dummy dlltool; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2375: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2375,2379 ----
  set dummy dlltool; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2378: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** fi
*** 2407,2411 ****
  set dummy ${ac_tool_prefix}as; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2410: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2410,2414 ----
  set dummy ${ac_tool_prefix}as; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2413: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** if test -n "$ac_tool_prefix"; then
*** 2439,2443 ****
  set dummy as; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2442: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2442,2446 ----
  set dummy as; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2445: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** esac
*** 2637,2641 ****
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:2640: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
--- 2640,2644 ----
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:2643: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
*************** else
*** 2652,2656 ****
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 2655 "configure"
  #include "confdefs.h"
  #include <assert.h>
--- 2655,2659 ----
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 2658 "configure"
  #include "confdefs.h"
  #include <assert.h>
*************** Syntax Error
*** 2658,2662 ****
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 2661,2665 ----
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
*************** else
*** 2669,2673 ****
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 2672 "configure"
  #include "confdefs.h"
  #include <assert.h>
--- 2672,2676 ----
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 2675 "configure"
  #include "confdefs.h"
  #include <assert.h>
*************** Syntax Error
*** 2675,2679 ****
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 2678,2682 ----
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
*************** else
*** 2686,2690 ****
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
! #line 2689 "configure"
  #include "confdefs.h"
  #include <assert.h>
--- 2689,2693 ----
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
! #line 2692 "configure"
  #include "confdefs.h"
  #include <assert.h>
*************** Syntax Error
*** 2692,2696 ****
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 2695,2699 ----
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
*************** echo "$ac_t""$CPP" 1>&6
*** 2717,2721 ****
  
  cat > conftest.$ac_ext <<EOF
! #line 2720 "configure"
  #include "confdefs.h"
  #include <stdint.h>
--- 2720,2724 ----
  
  cat > conftest.$ac_ext <<EOF
! #line 2723 "configure"
  #include "confdefs.h"
  #include <stdint.h>
*************** rm -f conftest*
*** 2732,2736 ****
  
  cat > conftest.$ac_ext <<EOF
! #line 2735 "configure"
  #include "confdefs.h"
  #include <inttypes.h>
--- 2735,2739 ----
  
  cat > conftest.$ac_ext <<EOF
! #line 2738 "configure"
  #include "confdefs.h"
  #include <inttypes.h>
*************** rm -f conftest*
*** 2747,2751 ****
  
  cat > conftest.$ac_ext <<EOF
! #line 2750 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2750,2754 ----
  
  cat > conftest.$ac_ext <<EOF
! #line 2753 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
*************** rm -f conftest*
*** 2762,2766 ****
  
  cat > conftest.$ac_ext <<EOF
! #line 2765 "configure"
  #include "confdefs.h"
  #include <sys/config.h>
--- 2765,2769 ----
  
  cat > conftest.$ac_ext <<EOF
! #line 2768 "configure"
  #include "confdefs.h"
  #include <sys/config.h>
*************** rm -f conftest*
*** 2779,2783 ****
  
  cat > conftest.$ac_ext <<EOF
! #line 2782 "configure"
  #include "confdefs.h"
  #include <time.h>
--- 2782,2786 ----
  
  cat > conftest.$ac_ext <<EOF
! #line 2785 "configure"
  #include "confdefs.h"
  #include <time.h>
*************** rm -f conftest*
*** 2794,2798 ****
  
  cat > conftest.$ac_ext <<EOF
! #line 2797 "configure"
  #include "confdefs.h"
  #include <time.h>
--- 2797,2801 ----
  
  cat > conftest.$ac_ext <<EOF
! #line 2800 "configure"
  #include "confdefs.h"
  #include <time.h>
*************** libsubdir=.libs
*** 2832,2836 ****
  
  echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6
! echo "configure:2835: checking for garbage collector to use" >&5
  # Check whether --enable-java-gc or --disable-java-gc was given.
  if test "${enable_java_gc+set}" = set; then
--- 2835,2839 ----
  
  echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6
! echo "configure:2838: checking for garbage collector to use" >&5
  # Check whether --enable-java-gc or --disable-java-gc was given.
  if test "${enable_java_gc+set}" = set; then
*************** esac
*** 2882,2886 ****
  
  echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
! echo "configure:2885: checking for threads package to use" >&5
  # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
--- 2885,2889 ----
  
  echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
! echo "configure:2888: checking for threads package to use" >&5
  # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
*************** else
*** 3074,3083 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3077: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3082 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3077,3086 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3080: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3085 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3102,3106 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3105,3109 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** done
*** 3129,3138 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3132: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3137 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3132,3141 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3135: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3140 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3157,3161 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3160,3164 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** done
*** 3184,3193 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3187: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3192 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3187,3196 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3190: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3195 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3212,3216 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3215,3219 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** fi
*** 3236,3248 ****
  done
  
!    for ac_func in access stat mkdir rename rmdir unlink realpath
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3242: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3247 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3239,3251 ----
  done
  
!    for ac_func in access stat mkdir rename rmdir unlink realpath getcwd
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3245: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3250 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3267,3271 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3270,3274 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** done
*** 3294,3303 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3297: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3302 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3297,3306 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3300: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3305 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3322,3326 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3325,3329 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** done
*** 3349,3358 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3352: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3357 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3352,3361 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3355: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3360 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3377,3381 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3380,3384 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** done
*** 3405,3414 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3408: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3413 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3408,3417 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3411: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3416 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3433,3437 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3436,3440 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** EOF
*** 3460,3464 ****
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3463 "configure"
  #include "confdefs.h"
  #include <netdb.h>
--- 3463,3467 ----
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3466 "configure"
  #include "confdefs.h"
  #include <netdb.h>
*************** done
*** 3484,3493 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3487: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3492 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3487,3496 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3490: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3495 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3512,3516 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3515,3519 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** EOF
*** 3539,3543 ****
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3542 "configure"
  #include "confdefs.h"
  #include <netdb.h>
--- 3542,3546 ----
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3545 "configure"
  #include "confdefs.h"
  #include <netdb.h>
*************** done
*** 3563,3572 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3566: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3571 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3566,3575 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3569: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3574 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3591,3595 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3594,3598 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** EOF
*** 3615,3619 ****
  
       cat > conftest.$ac_ext <<EOF
! #line 3618 "configure"
  #include "confdefs.h"
  #include <unistd.h>
--- 3618,3622 ----
  
       cat > conftest.$ac_ext <<EOF
! #line 3621 "configure"
  #include "confdefs.h"
  #include <unistd.h>
*************** done
*** 3642,3651 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3645: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3650 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3645,3654 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3648: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3653 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3670,3674 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3673,3677 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** done
*** 3698,3707 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3701: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3706 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3701,3710 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3704: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3709 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3726,3730 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3729,3733 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** else
*** 3748,3752 ****
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
! echo "configure:3751: checking for sched_yield in -lposix4" >&5
  ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3751,3755 ----
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
! echo "configure:3754: checking for sched_yield in -lposix4" >&5
  ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 3756,3760 ****
  LIBS="-lposix4  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3759 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3759,3763 ----
  LIBS="-lposix4  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3762 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
*************** sched_yield()
*** 3767,3771 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3770,3774 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** done
*** 3802,3811 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3805: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3810 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3805,3814 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3808: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3813 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3830,3834 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3833,3837 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** done
*** 3863,3872 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3866: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3871 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3866,3875 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3869: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3874 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3891,3895 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3894,3898 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** done
*** 3924,3933 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3927: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3932 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3927,3936 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3930: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3935 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3952,3956 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3955,3959 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** done
*** 4000,4004 ****
  
     echo $ac_n "checking for socket libraries""... $ac_c" 1>&6
! echo "configure:4003: checking for socket libraries" >&5
  if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4003,4007 ----
  
     echo $ac_n "checking for socket libraries""... $ac_c" 1>&6
! echo "configure:4006: checking for socket libraries" >&5
  if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 4008,4017 ****
       unset ac_cv_func_connect
       echo $ac_n "checking for connect""... $ac_c" 1>&6
! echo "configure:4011: checking for connect" >&5
  if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4016 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 4011,4020 ----
       unset ac_cv_func_connect
       echo $ac_n "checking for connect""... $ac_c" 1>&6
! echo "configure:4014: checking for connect" >&5
  if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4019 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** connect();
*** 4036,4040 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_connect=yes"
--- 4039,4043 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_connect=yes"
*************** fi
*** 4059,4063 ****
  	 unset ac_cv_func_connect
  	 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
! echo "configure:4062: checking for main in -lsocket" >&5
  ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 4062,4066 ----
  	 unset ac_cv_func_connect
  	 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
! echo "configure:4065: checking for main in -lsocket" >&5
  ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 4067,4071 ****
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4070 "configure"
  #include "confdefs.h"
  
--- 4070,4074 ----
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4073 "configure"
  #include "confdefs.h"
  
*************** main()
*** 4074,4078 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 4077,4081 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** fi
*** 4101,4110 ****
  	 unset ac_cv_func_accept
  	 echo $ac_n "checking for accept""... $ac_c" 1>&6
! echo "configure:4104: checking for accept" >&5
  if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4109 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 4104,4113 ----
  	 unset ac_cv_func_accept
  	 echo $ac_n "checking for accept""... $ac_c" 1>&6
! echo "configure:4107: checking for accept" >&5
  if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4112 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** accept();
*** 4129,4133 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_accept=yes"
--- 4132,4136 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_accept=yes"
*************** fi
*** 4156,4165 ****
       LIBS="$LIBS $gcj_cv_lib_sockets"
       echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
! echo "configure:4159: checking for gethostbyname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4164 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 4159,4168 ----
       LIBS="$LIBS $gcj_cv_lib_sockets"
       echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
! echo "configure:4162: checking for gethostbyname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4167 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** gethostbyname();
*** 4184,4188 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostbyname=yes"
--- 4187,4191 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostbyname=yes"
*************** else
*** 4202,4206 ****
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
! echo "configure:4205: checking for main in -lnsl" >&5
  ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 4205,4209 ----
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
! echo "configure:4208: checking for main in -lnsl" >&5
  ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 4210,4214 ****
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4213 "configure"
  #include "confdefs.h"
  
--- 4213,4217 ----
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4216 "configure"
  #include "confdefs.h"
  
*************** main()
*** 4217,4221 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 4220,4224 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** echo "$ac_t""$gcj_cv_lib_sockets" 1>&6
*** 4249,4253 ****
     if test "$with_system_zlib" = yes; then
        echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
! echo "configure:4252: checking for deflate in -lz" >&5
  ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 4252,4256 ----
     if test "$with_system_zlib" = yes; then
        echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
! echo "configure:4255: checking for deflate in -lz" >&5
  ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 4257,4261 ****
  LIBS="-lz  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4260 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 4260,4264 ----
  LIBS="-lz  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4263 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
*************** deflate()
*** 4268,4272 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 4271,4275 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** fi
*** 4297,4301 ****
     if test "$GC" = boehm; then
        echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
! echo "configure:4300: checking for main in -ldl" >&5
  ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 4300,4304 ----
     if test "$GC" = boehm; then
        echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
! echo "configure:4303: checking for main in -ldl" >&5
  ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 4305,4309 ****
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4308 "configure"
  #include "confdefs.h"
  
--- 4308,4312 ----
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4311 "configure"
  #include "confdefs.h"
  
*************** main()
*** 4312,4316 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 4315,4319 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** do
*** 4421,4435 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4424: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4429 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 4424,4438 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4427: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4432 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
*************** do
*** 4461,4475 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4464: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4469 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 4464,4478 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4467: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4472 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
*************** done
*** 4499,4505 ****
  
  echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
! echo "configure:4502: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4504 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
--- 4502,4508 ----
  
  echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
! echo "configure:4505: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4507 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
*************** struct sockaddr_in6 addr6;
*** 4508,4512 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
--- 4511,4515 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
*************** rm -f conftest*
*** 4524,4530 ****
  
  echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
! echo "configure:4527: checking for socklen_t in sys/socket.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4529 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
--- 4527,4533 ----
  
  echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
! echo "configure:4530: checking for socklen_t in sys/socket.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4532 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
*************** socklen_t x = 5;
*** 4533,4537 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
--- 4536,4540 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
*************** rm -f conftest*
*** 4549,4555 ****
  
  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
! echo "configure:4552: checking for tm_gmtoff in struct tm" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4554 "configure"
  #include "confdefs.h"
  #include <time.h>
--- 4552,4558 ----
  
  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
! echo "configure:4555: checking for tm_gmtoff in struct tm" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4557 "configure"
  #include "confdefs.h"
  #include <time.h>
*************** struct tm tim; tim.tm_gmtoff = 0;
*** 4558,4562 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
--- 4561,4565 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
*************** else
*** 4571,4577 ****
    echo "$ac_t""no" 1>&6
     echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
! echo "configure:4574: checking for global timezone variable" >&5
              cat > conftest.$ac_ext <<EOF
! #line 4576 "configure"
  #include "confdefs.h"
  #include <time.h>
--- 4574,4580 ----
    echo "$ac_t""no" 1>&6
     echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
! echo "configure:4577: checking for global timezone variable" >&5
              cat > conftest.$ac_ext <<EOF
! #line 4579 "configure"
  #include "confdefs.h"
  #include <time.h>
*************** long z2 = timezone;
*** 4580,4584 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
--- 4583,4587 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
*************** rm -f conftest*
*** 4600,4609 ****
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:4603: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4608 "configure"
  #include "confdefs.h"
  #include <alloca.h>
--- 4603,4612 ----
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:4606: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4611 "configure"
  #include "confdefs.h"
  #include <alloca.h>
*************** char *p = alloca(2 * sizeof(int));
*** 4612,4616 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
--- 4615,4619 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
*************** fi
*** 4633,4642 ****
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:4636: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4641 "configure"
  #include "confdefs.h"
  
--- 4636,4645 ----
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:4639: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4644 "configure"
  #include "confdefs.h"
  
*************** char *p = (char *) alloca(1);
*** 4666,4670 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
--- 4669,4673 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
*************** EOF
*** 4698,4707 ****
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:4701: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4706 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
--- 4701,4710 ----
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:4704: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4709 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
*************** if test $ac_cv_os_cray = yes; then
*** 4728,4737 ****
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4731: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4736 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 4731,4740 ----
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4734: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4739 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 4756,4760 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 4759,4763 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** fi
*** 4783,4787 ****
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:4786: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4786,4790 ----
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:4789: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 4791,4795 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4794 "configure"
  #include "confdefs.h"
  find_stack_direction ()
--- 4794,4798 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4797 "configure"
  #include "confdefs.h"
  find_stack_direction ()
*************** main ()
*** 4810,4814 ****
  }
  EOF
! if { (eval echo configure:4813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
--- 4813,4817 ----
  }
  EOF
! if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
*************** do
*** 4837,4841 ****
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:4840: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4840,4844 ----
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:4843: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** s%@LIBGCJ_CFLAGS@%$LIBGCJ_CFLAGS%g
*** 5063,5066 ****
--- 5066,5070 ----
  s%@LIBGCJ_CXXFLAGS@%$LIBGCJ_CXXFLAGS%g
  s%@LIBGCJ_JAVAFLAGS@%$LIBGCJ_JAVAFLAGS%g
+ s%@DIVIDESPEC@%$DIVIDESPEC%g
  s%@LD@%$LD%g
  s%@NM@%$NM%g
Index: configure.host
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.host,v
retrieving revision 1.1.1.1
diff -p -2 -c -r1.1.1.1 configure.host
*** configure.host	1999/04/07 14:52:32	1.1.1.1
--- configure.host	1999/07/21 15:03:34
*************** AM_RUNTESTFLAGS= 
*** 44,55 ****
  echo "$target"
  
  case "${host}" in
    mips-tx39-*|mipstx39-unknown-*)
  	libgcj_flags="${libgcj_flags} -G 0"
  	LDFLAGS="$LDFLAGS -Tjmr3904dram.ld"
! 	AM_RUNTESTFLAGS="--target_board=jmr3904-sim"
  	;;
    i686-*|i586-*)
  	libgcj_flags="${libgcj_flags} -ffloat-store"
  	;;
    *)
--- 44,58 ----
  echo "$target"
  
+ DIVIDESPEC=-fuse-divide-subroutine
+ 
  case "${host}" in
    mips-tx39-*|mipstx39-unknown-*)
  	libgcj_flags="${libgcj_flags} -G 0"
  	LDFLAGS="$LDFLAGS -Tjmr3904dram.ld"
! 	AM_RUNTESTFLAGS="--target_board=jmr3904-sim"	
  	;;
    i686-*|i586-*)
  	libgcj_flags="${libgcj_flags} -ffloat-store"
+ 	DIVIDESPEC=-fno-use-divide-subroutine
  	;;
    *)
Index: libgcj.spec.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/libgcj.spec.in,v
retrieving revision 1.2
diff -p -2 -c -r1.2 libgcj.spec.in
*** libgcj.spec.in	1999/05/11 13:03:47	1.2
--- libgcj.spec.in	1999/07/21 15:03:34
***************
*** 6,7 ****
--- 6,10 ----
  %rename lib liborig
  *lib: -lgcj -lm @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(liborig)
+ 
+ %rename cc1 cc1orig
+ *cc1:  @DIVIDESPEC@ %(cc1orig)
Index: prims.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/prims.cc,v
retrieving revision 1.5
diff -p -2 -c -r1.5 prims.cc
*** prims.cc	1999/05/20 08:26:51	1.5
--- prims.cc	1999/07/21 15:03:34
*************** SIGNAL_HANDLER (catch_segv)
*** 65,70 ****
  #endif
  
- #ifdef HANDLE_FPE
  static java::lang::ArithmeticException *arithexception;
  SIGNAL_HANDLER (catch_fpe)
  {
--- 65,71 ----
  #endif
  
  static java::lang::ArithmeticException *arithexception;
+ 
+ #ifdef HANDLE_FPE
  SIGNAL_HANDLER (catch_fpe)
  {
*************** JvRunMain (jclass klass, int argc, const
*** 575,579 ****
--- 576,585 ----
  {
    INIT_SEGV;
+ #ifdef HANDLE_FPE
    INIT_FPE;
+ #else
+   arithexception = new java::lang::ArithmeticException
+     (JvNewStringLatin1 ("/ by zero"));
+ #endif
  
    no_memory = new java::lang::OutOfMemoryError;
*************** _Jv_Free (void* ptr)
*** 611,612 ****
--- 617,674 ----
    return free (ptr);
  }
+ 
+ 
+ 
+ // In theory, these routines can be #ifdef'd away on machines which
+ // support divide overflow signals.  However, we never know if some
+ // code might have been compiled with "-fuse-divide-subroutine", so we
+ // always include them in libgcj.
+ 
+ jint
+ _Jv_divI (jint dividend, jint divisor)
+ {
+   if (divisor == 0)
+     _Jv_Throw (arithexception);
+   
+   if (dividend == 0x80000000L && divisor == -1)
+     return dividend;
+ 
+   return dividend / divisor;
+ }
+ 
+ jint
+ _Jv_remI (jint dividend, jint divisor)
+ {
+   if (divisor == 0)
+     _Jv_Throw (arithexception);
+   
+   if (dividend == 0x80000000L && divisor == -1)
+     return 0;
+ 
+   return dividend % divisor;
+ }
+ 
+ jlong
+ _Jv_divJ (jlong dividend, jlong divisor)
+ {
+   if (divisor == 0)
+     _Jv_Throw (arithexception);
+   
+   if (dividend == 0x8000000000000000LL && divisor == -1)
+     return dividend;
+ 
+   return dividend / divisor;
+ }
+ 
+ jlong
+ _Jv_remJ (jlong dividend, jlong divisor)
+ {
+   if (divisor == 0)
+     _Jv_Throw (arithexception);
+   
+   if (dividend == 0x8000000000000000LL && divisor == -1)
+     return 0;
+ 
+   return dividend % divisor;
+ }
+ 
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.1.1.1
diff -p -2 -c -r1.1.1.1 jvm.h
*** jvm.h	1999/04/07 14:52:35	1.1.1.1
--- jvm.h	1999/07/21 15:03:34
*************** extern jclass _Jv_FindClassFromSignature
*** 99,101 ****
--- 99,110 ----
  extern jobject _Jv_NewMultiArray (jclass, jint ndims, jint* dims);
  
+ /* Checked divide subroutines. */
+ extern "C"
+ {
+   jint _Jv_divI (jint, jint);
+   jint _Jv_remI (jint, jint);
+   jlong _Jv_divJ (jlong, jlong);
+   jlong _Jv_remJ (jlong, jlong);
+ }
+ 
  #endif /* __JAVA_JVM_H__ */


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]