X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2Fconfigure.in;h=59f821accce5d16003fd90f58f13e4274bdde728;hb=925cf7ab585f432e5297e373aadaf3da078bd75a;hp=767ea0ebd54b9a3d63552db79cad80c0c0eb34cb;hpb=1096416e8a0c8d3cc6a8c3c200763a0366b8aa7a;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libjava/configure.in b/libjava/configure.in index 767ea0ebd54..59f821accce 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -1,6 +1,12 @@ dnl Process this with autoconf to create configure AC_INIT(java/lang/System.java) +# This works around the fact that libtool configuration may change LD +# for this particular configuration, but some shells, instead of +# keeping the changes in LD private, export them just because LD is +# exported. +ORIGINAL_LD_FOR_MULTILIBS=$LD + AC_PROG_LN_S dnl We use these options to decide which functions to include. @@ -10,6 +16,9 @@ AC_ARG_WITH(target-subdir, AC_ARG_WITH(cross-host, [ --with-cross-host=HOST configuring with a cross compiler]) +AC_ARG_WITH(newlib, +[ --with-newlib Configuring with newlib]) + LIBGCJ_CONFIGURE(.) AM_CONFIG_HEADER(include/config.h gcj/libgcj-config.h) @@ -23,7 +32,7 @@ if test -z "${with_cross_host}"; then # Sigh. Libtool's macro doesn't do the right thing. INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL" # FIXME: this is a hack. - sub_auxdir="`cd $ac_aux_dir && pwd`" + sub_auxdir="`cd $ac_aux_dir && ${PWDCMD-pwd}`" ac_configure_args="$ac_configure_args --with-auxdir=$sub_auxdir" fi AC_SUBST(INCLTDL) @@ -106,6 +115,8 @@ AC_ARG_ENABLE(interpreter, if test "$libgcj_interpreter" = yes; then AC_DEFINE(INTERPRETER) fi +INTERPRETER="$libgcj_interpreter" +AC_SUBST(INTERPRETER) AC_MSG_CHECKING([for exception model to use]) AC_LANG_SAVE @@ -153,6 +164,14 @@ fi AC_LANG_RESTORE AC_MSG_RESULT($ac_exception_model_name) +# If we are non using SJLJ exceptions, and this host does not have support +# for unwinding from a signal handler, enable checked dereferences and divides. +if test $can_unwind_signal = no && test $enable_sjlj_exceptions = no; then + CHECKREFSPEC=-fcheck-references + DIVIDESPEC=-fuse-divide-subroutine + EXCEPTIONSPEC= +fi + dnl See if the user wants to disable java.net. This is the mildly dnl ugly way that we admit that target-side configuration sucks. AC_ARG_ENABLE(java-net, @@ -177,7 +196,7 @@ LIBFFIINCS= if test "$with_libffi" != no; then AC_DEFINE(USE_LIBFFI) LIBFFI=../libffi/libffi_convenience.la - LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include' + LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I../libffi/include' fi AC_SUBST(LIBFFI) AC_SUBST(LIBFFIINCS) @@ -207,6 +226,7 @@ case "$TARGET_ECOS" in PLATFORM=Win32 PLATFORMOBJS=win32.lo PLATFORMH=win32.h + CHECK_FOR_BROKEN_MINGW_LD ;; *) PLATFORM=Posix @@ -259,7 +279,7 @@ case "${host}" in esac AC_SUBST(SYSTEMSPEC) -LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs" +LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -rpath `${PWDCMD-pwd}`/.libs" AC_SUBST(LIBGCJTESTSPEC) AC_ARG_WITH(system-zlib, @@ -293,7 +313,7 @@ case "$GC" in GCLIBS=../boehm-gc/libgcjgc_convenience.la GCINCS='-I$(top_srcdir)/../boehm-gc/include' JC1GCSPEC='-fuse-boehm-gc' - GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs" + GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" dnl We also want to pick up some cpp flags required when including dnl boehm-config.h. Yuck. @@ -420,11 +440,12 @@ AC_SUBST(THREADOBJS) AC_SUBST(THREADSPEC) AC_SUBST(THREADLDFLAGS) -AC_LINK_FILES(sysdep/$sysdeps_dir, sysdep) +if test -d sysdep; then true; else mkdir sysdep; fi +AC_LINK_FILES(sysdep/$sysdeps_dir/locks.h, sysdep/locks.h) HASH_SYNC_SPEC= # Hash synchronization is only useful with posix threads right now. -if test "$enable_hash_synchronization" = yes && test "$THREADS" = "posix"; then +if test "$enable_hash_synchronization" = yes && test "$THREADS" != "none"; then HASH_SYNC_SPEC=-fhash-synchronization AC_DEFINE(JV_HASH_SYNCHRONIZATION, 1, [Define if hash synchronization is in use]) fi @@ -442,14 +463,15 @@ GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc' # Figure out where generated headers like libgcj-config.h get installed. changequote(,)dnl -gcc_version_trigger=${srcdir}/../gcc/version.c +gcc_version_trigger=${libgcj_basedir}/../gcc/version.c gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'` gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` tool_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include changequote([,])dnl AC_SUBST(tool_include_dir) +AC_SUBST(gcc_version) -if test -n "${with_cross_host}"; then +if test "x${with_newlib}" = "xyes"; then # We are being configured with a cross compiler. AC_REPLACE_FUNCS # may not work correctly, because the compiler may not be able to # link executables. @@ -472,7 +494,8 @@ if test -n "${with_cross_host}"; then # If Canadian cross, then don't pick up tools from the build # directory. - if test x"$build" != x"$with_cross_host" && x"$build" != x"$target"; then + if test x"$build" != x"$with_cross_host" \ + && test x"$build" != x"$target"; then CANADIAN=yes GCC_UNWIND_INCLUDE= GCJ="${target_alias}-gcj" @@ -485,12 +508,34 @@ else AC_CHECK_FUNCS(nl_langinfo setlocale) AC_CHECK_FUNCS(inet_aton inet_addr, break) AC_CHECK_FUNCS(inet_pton uname inet_ntoa) - AC_CHECK_FUNCS(backtrace fork execvp pipe sigaction) + AC_CHECK_FUNCS(fork execvp pipe sigaction ftruncate) AC_CHECK_HEADERS(execinfo.h unistd.h dlfcn.h) + AC_CHECK_FUNC(backtrace, [ + case "$host" in + ia64-*-linux*) + # Has broken backtrace() + ;; + s390*-*-linux*) + # Has broken backtrace() + ;; + *) + AC_DEFINE(HAVE_BACKTRACE) + ;; + esac + ]) + AC_CHECK_LIB(dl, dladdr, [ AC_DEFINE(HAVE_DLADDR)]) - AC_CHECK_FILES(/proc/self/exe, [ - AC_DEFINE(HAVE_PROC_SELF_EXE)]) + if test x"$build" = x"$host"; then + AC_CHECK_FILES(/proc/self/exe, [ + AC_DEFINE(HAVE_PROC_SELF_EXE)]) + else + case $host in + *-linux*) + AC_DEFINE(HAVE_PROC_SELF_EXE) + ;; + esac + fi AM_ICONV AM_LC_MESSAGES @@ -683,12 +728,12 @@ changequote(<<,>>) changequote([,]) fi if test -x "${builddotdot}/../../gcc/gcj"; then - dir="`cd ${builddotdot}/../../gcc && pwd`" - GCJ="$dir/gcj -B`pwd`/ -B$dir/" + dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`" + GCJ="$dir/gcj -B`${PWDCMD-pwd}`/ -B$dir/" else CANADIAN=yes NULL_TARGET=yes - GCJ="gcj -B`pwd`/" + GCJ="gcj -B`${PWDCMD-pwd}`/" fi fi @@ -698,7 +743,7 @@ test -f libgcj.spec || touch libgcj.spec # We must search the source tree for java.lang, since we still don't # have libgcj.jar nor java/lang/*.class GCJ_SAVE_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS -I`pwd` -I`cd $srcdir && pwd`" +CPPFLAGS="$CPPFLAGS -I`${PWDCMD-pwd}` -I`cd $srcdir && ${PWDCMD-pwd}`" # Since some classes depend on this one, we need its source available # before we can do any GCJ compilation test :-( @@ -748,8 +793,6 @@ AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes) AC_SUBST(GCC_UNWIND_INCLUDE) -AC_SUBST(AM_RUNTESTFLAGS) - # Determine gcj version number. changequote(<<,>>) gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'` @@ -771,7 +814,7 @@ CFLAGS="$save_CFLAGS" dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there. dnl On that system, sys/ioctl.h will not include sys/filio.h unless dnl BSD_COMP is defined; just including sys/filio.h is simpler. -AC_CHECK_HEADERS(unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h sys/config.h stdint.h langinfo.h locale.h) +AC_CHECK_HEADERS(unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h net/if.h pwd.h sys/config.h stdint.h langinfo.h locale.h) dnl We avoid AC_HEADER_DIRENT since we really only care about dirent.h dnl for now. If you change this, you also must update natFile.cc. AC_CHECK_HEADERS(dirent.h) @@ -831,10 +874,17 @@ AC_TRY_COMPILE([#include ], [struct tm tim; tim.tm_gmtoff = 0;], dnl FIXME: we don't want a link check here because that won't work dnl when cross-compiling. So instead we make an assumption that dnl the header file will mention timezone if it exists. - AC_TRY_COMPILE([#include ], [long z2 = timezone;], + dnl Don't find the win32 function timezone + AC_TRY_COMPILE([#include ], [void i(){long z2 = 2*timezone;}], [AC_DEFINE(HAVE_TIMEZONE) AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)])]) + [AC_MSG_RESULT(no) + AC_MSG_CHECKING([for global _timezone variable]) + dnl FIXME: As above, don't want link check + AC_TRY_COMPILE([#include ], [long z2 = _timezone;], + [AC_DEFINE(HAVE_UNDERSCORE_TIMEZONE) + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)])])]) AC_FUNC_ALLOCA @@ -846,7 +896,7 @@ case "${host}" in i?86-*-linux*) SIGNAL_HANDLER=include/i386-signal.h ;; - sparc-sun-solaris*) + sparc*-sun-solaris*) SIGNAL_HANDLER=include/sparc-signal.h ;; # ia64-*) @@ -862,6 +912,15 @@ case "${host}" in alpha*-*-linux*) SIGNAL_HANDLER=include/dwarf2-signal.h ;; + s390*-*-linux*) + SIGNAL_HANDLER=include/s390-signal.h + ;; + x86_64*-*-linux*) + SIGNAL_HANDLER=include/dwarf2-signal.h + ;; + sparc*-*-linux*) + SIGNAL_HANDLER=include/dwarf2-signal.h + ;; *mingw*) SIGNAL_HANDLER=include/win32-signal.h ;; @@ -923,7 +982,7 @@ AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes) AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes) -here=`pwd` +here=`${PWDCMD-pwd}` AC_SUBST(here) # We get this from the environment. @@ -933,13 +992,14 @@ AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java [# Only add multilib support code if we just rebuilt top-level Makefile. case " $CONFIG_FILES " in *" Makefile "*) + LD="${ORIGINAL_LD_FOR_MULTILIBS}" ac_file=Makefile . ${libgcj_basedir}/../config-ml.in ;; esac # Make subdirectories and `.d' files. Look in both srcdir and # builddir for the .java files. -h=`pwd` +h=`${PWDCMD-pwd}` : > deps.mk ( (cd $srcdir && find . \( -name '*.java' -o -name '*.cc' \) -print) ; find . \( -name '*.java' -o -name '*.cc' \) -print) | \