dnl set optimization and debugging for all architectures and systems
if test x"$CFLAGS" = "x"; then
- CFLAGS="-O0 -g3"
+ OPT_CFLAGS="-O0 -g3"
+else
+ OPT_CFLAGS=$CFLAGS
fi
dnl system type
case "$host_cpu" in
alpha | alphaev56 | alphapca56 )
ARCH_DIR="alpha"
- CFLAGS="$CFLAGS -mieee -D__ALPHA__"
+ ARCH_CFLAGS="-mieee -D__ALPHA__"
;;
arm | armv4tl | armv5b | armv5l )
ARCH_DIR="arm"
- CFLAGS="$CFLAGS -D__ARM__"
+ ARCH_CFLAGS="-D__ARM__"
;;
i386 | i486 | i586 | i686 )
ARCH_DIR="i386"
- CFLAGS="$CFLAGS -D__I386__"
+ ARCH_CFLAGS="-D__I386__"
;;
mips )
ARCH_DIR="mips"
- CFLAGS="$CFLAGS -D__MIPS__"
+ ARCH_CFLAGS="-D__MIPS__"
;;
powerpc )
ARCH_DIR="powerpc"
- CFLAGS="$CFLAGS -D__POWERPC__"
+ ARCH_CFLAGS="-D__POWERPC__"
;;
powerpc64 )
ARCH_DIR="powerpc64"
- CFLAGS="$CFLAGS -D__POWERPC64__"
+ ARCH_CFLAGS="-D__POWERPC64__"
+ ;;
+
+sparc64 )
+ ARCH_DIR="sparc64"
+ ARCH_CFLAGS="-mcpu=v9 -m64 -D__SPARC_64__"
;;
x86_64 )
ARCH_DIR="x86_64"
- CFLAGS="$CFLAGS -D__X86_64__"
+ ARCH_CFLAGS="-D__X86_64__"
;;
xdspcore )
ARCH_DIR="xdspcore"
ENABLE_STATICVM="yes"
- CFLAGS="$CFLAGS -D__XDSPCORE__"
+ ARCH_CFLAGS="-D__XDSPCORE__"
USE_SCHEDULER="1"
;;
case "$host_os" in
*darwin* )
OS_DIR="darwin"
- INTRP_CFLAGS="$CFLAGS -D__DARWIN__ -Wall -Wno-long-long"
- CFLAGS="$CFLAGS -D__DARWIN__ -ansi -pedantic -Wall -Wno-long-long"
+ INTRP_CFLAGS="$ARCH_CFLAGS -D__DARWIN__ -Wall -Wno-long-long"
+ ARCH_CFLAGS="$ARCH_CFLAGS -D__DARWIN__ -ansi -pedantic -Wall -Wno-long-long"
;;
*freebsd* )
OS_DIR="freebsd"
- INTRP_CFLAGS="$CFLAGS -D__FREEBSD__ -Wall -Wno-long-long -D_XOPEN_SOURCE_EXTENDED"
- CFLAGS="$CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall -Wno-long-long -D_XOPEN_SOURCE_EXTENDED"
+ INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long -D_XOPEN_SOURCE_EXTENDED"
+ ARCH_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall -Wno-long-long -D_XOPEN_SOURCE_EXTENDED"
;;
*irix* )
OS_DIR="irix"
- INTRP_CFLAGS="$CFLAGS -D__IRIX__"
- CFLAGS="$CFLAGS -D__IRIX__"
+ INTRP_CFLAGS="$ARCH_CFLAGS -D__IRIX__"
+ ARCH_CFLAGS="$ARCH_CFLAGS -D__IRIX__"
;;
*linux* | *Linux* )
OS_DIR="linux"
- INTRP_CFLAGS="$CFLAGS -D__LINUX__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
- CFLAGS="$CFLAGS -D__LINUX__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+ INTRP_CFLAGS="$ARCH_CFLAGS -D__LINUX__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+ ARCH_CFLAGS="$ARCH_CFLAGS -D__LINUX__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
;;
*netbsd* )
OS_DIR="netbsd"
- INTRP_CFLAGS="$CFLAGS -D__NETBSD__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
- CFLAGS="$CFLAGS -D__NETBSD__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+ INTRP_CFLAGS="$ARCH_CFLAGS -D__NETBSD__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+ ARCH_CFLAGS="$ARCH_CFLAGS -D__NETBSD__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
;;
* )
esac
+dnl temporary set the CFLAGS for configure tests (e.g. inline keyword)
+dnl we set it properly at the end of this file
+CFLAGS="$ARCH_CFLAGS $OPT_CFLAGS"
+
+
dnl define some stuff required for --fullversion
AC_DEFINE_UNQUOTED(VERSION_CONFIGURE_ARGS, "$ac_configure_args", [configure arguments])
AC_DEFINE_UNQUOTED(VERSION_CC, "$CC", [CC used])
-AC_DEFINE_UNQUOTED(VERSION_CFLAGS, "$CFLAGS", [CFLAGS used])
+AC_DEFINE_UNQUOTED(VERSION_CFLAGS, "$OPT_CFLAGS $ARCH_CFLAGS", [CFLAGS used])
dnl define and substitute some architecture specific variables
AC_PROG_GCC_TRADITIONAL
AC_TYPE_SIGNAL
AC_FUNC_MEMCMP
-AC_CHECK_FUNCS([calloc mprotect getpagesize free])
+AC_FUNC_MMAP
+AC_CHECK_FUNCS([calloc mmap getpagesize free])
AC_CHECK_FUNCS([getcwd gettimeofday])
AC_CHECK_FUNCS([scandir])
-AC_CHECK_FUNCS([mmap])
AC_CHECK_FUNCS([isnan])
dnl Checks for libraries.
AC_DEFINE_UNQUOTED([CACAO_PREFIX], "${CACAO_PREFIX}", [installation prefix])
AC_SUBST(CACAO_PREFIX)
+dnl define libdir prefix
+if test "x$libdir" = "xNONE"; then
+ CACAO_LIBDIR=$ac_default_libdir
+else
+ CACAO_LIBDIR=$libdir
+fi
+dnl expand CACAO_LIBDIR to something that is usable in C code
+AS_AC_EXPAND([CACAO_LIBDIR], ${CACAO_LIBDIR})
+AC_DEFINE_UNQUOTED([CACAO_LIBDIR], "${CACAO_LIBDIR}", [library installation prefix])
+AC_SUBST(CACAO_LIBDIR)
+
dnl Features
dnl check for disassembler support
AC_MSG_CHECKING(whether disassembler should be enabled)
AC_ARG_ENABLE([disassembler],
- [AS_HELP_STRING(--disable-disassembler,disable disassembler [[default=yes]])],
+ [AS_HELP_STRING(--enable-disassembler,enable disassembler [[default=no]])],
[case "${enableval}" in
- no) ENABLE_DISASSEMBLER=no;;
- *) ENABLE_DISASSEMBLER=yes;;
+ yes) ENABLE_DISASSEMBLER=yes;;
+ *) ENABLE_DISASSEMBLER=no;;
esac],
- [ENABLE_DISASSEMBLER=yes])
+ [ENABLE_DISASSEMBLER=no])
AC_MSG_RESULT(${ENABLE_DISASSEMBLER})
AM_CONDITIONAL([ENABLE_DISASSEMBLER], test x"${ENABLE_DISASSEMBLER}" = "xyes")
dnl check for binutils headers and libraries on some architectures for the
dnl disassembler
case "${ARCH_DIR}" in
- arm | i386 | powerpc | x86_64 )
+ arm | i386 | powerpc | x86_64 | sparc64 | powerpc64)
AC_CHECK_HEADER([ansidecl.h],, [AC_MSG_ERROR(cannot find ansidecl.h)])
AC_CHECK_HEADER([symcat.h],, [AC_MSG_ERROR(cannot find symcat.h)])
AC_CHECK_HEADER([bfd.h],, [AC_MSG_ERROR(cannot find bfd.h)])
AC_MSG_RESULT(yes, native)
AC_CHECK_LIB(pthread, main)
-
- CFLAGS="$CFLAGS -D_REENTRANT"
-
+
+ ARCH_CFLAGS="$ARCH_CFLAGS -D_REENTRANT"
+
+ dnl we changed ARCH_CFLAGS, set CFLAGS again
+ CFLAGS="$ARCH_CFLAGS $OPT_CFLAGS"
+
dnl tell boehm to support threads as well
ac_configure_args="$ac_configure_args --enable-boehm-threads=posix"
;;
[cat > conftest.c <<\EOF
__thread int a = 42;
EOF
- if AC_TRY_COMMAND([${CC-cc} $CFLAGS -c conftest.c >&AS_MESSAGE_LOG_FD]); then
+ if AC_TRY_COMMAND([${CC-cc} $ARCH_CFLAGS $OPT_CFLAGS -c conftest.c >&AS_MESSAGE_LOG_FD]); then
ac_cv_gcc___thread=yes
else
ac_cv_gcc___thread=no
fi
+dnl check if linear scan register allocator(lsra) with SSA should be used
+AC_MSG_CHECKING(whether lsra with ssa should be supported)
+AC_ARG_ENABLE([ssa],
+ [AS_HELP_STRING(--disable-ssa,disable ssa [[default=no]])],
+ [case "${enableval}" in
+ no) ENABLE_SSA=no;;
+ *) ENABLE_SSA=yes;;
+ esac],
+ [ENABLE_SSA=no])
+AC_MSG_RESULT(${ENABLE_SSA})
+AM_CONDITIONAL([ENABLE_SSA], test x"${ENABLE_SSA}" = "xyes")
+
+if test x"${ENABLE_SSA}" = "xyes"; then
+ AC_DEFINE([ENABLE_SSA], 1, [enable lsra with ssa])
+ ENABLE_LSRA="no"
+fi
+
+
dnl check if linear scan register allocator(lsra) should be used
AC_MSG_CHECKING(whether lsra should be supported)
AC_ARG_ENABLE([lsra],
*) ENABLE_LSRA=no;;
esac],
[ENABLE_LSRA=no])
+
+if test x"${ENABLE_LSRA}" = "xyes"; then
+ if test x"${ENABLE_SSA}" = "xyes"; then
+ ENABLE_LSRA="no"
+ fi
+fi
AC_MSG_RESULT(${ENABLE_LSRA})
AM_CONDITIONAL([ENABLE_LSRA], test x"${ENABLE_LSRA}" = "xyes")
-
+
if test x"${ENABLE_LSRA}" = "xyes"; then
AC_DEFINE([ENABLE_LSRA], 1, [enable lsra])
fi
AC_PROG_JAR
-dnl now configure subpackages
-dnl the export is not my favorite (is there another way?)
-export CFLAGS
-AC_CONFIG_SUBDIRS(src/boehm-gc)
+dnl finally pass CFLAGS to Makefiles via AM_CFLAGS
+CFLAGS=$OPT_CFLAGS
+AM_CFLAGS=$ARCH_CFLAGS
+AC_SUBST(AM_CFLAGS)
AC_CONFIG_FILES([Makefile]
[src/native/tools/Makefile]
[src/native/vm/Makefile]
[src/scripts/Makefile]
- [src/scripts/jarsigner]
[src/scripts/java]
- [src/scripts/keytool]
[src/scripts/rmic]
[src/scripts/rmiregistry]
[src/threads/Makefile]
[src/threads/native/Makefile]
+ [src/threads/none/Makefile]
[src/toolbox/Makefile]
[src/vm/Makefile]
[src/vm/jit/Makefile]
[src/vm/jit/alpha/freebsd/Makefile]
[src/vm/jit/alpha/linux/Makefile]
[src/vm/jit/i386/Makefile]
+ [src/vm/jit/i386/darwin/Makefile]
[src/vm/jit/i386/freebsd/Makefile]
[src/vm/jit/i386/linux/Makefile]
[src/vm/jit/ifconv/Makefile]
[src/vm/jit/mips/Makefile]
[src/vm/jit/mips/irix/Makefile]
[src/vm/jit/mips/linux/Makefile]
+ [src/vm/jit/optimizing/Makefile]
[src/vm/jit/powerpc/Makefile]
[src/vm/jit/powerpc/darwin/Makefile]
[src/vm/jit/powerpc/linux/Makefile]
[src/vm/jit/powerpc/netbsd/Makefile]
+ [src/vm/jit/powerpc64/Makefile]
+ [src/vm/jit/powerpc64/linux/Makefile]
[src/vm/jit/profile/Makefile]
[src/vm/jit/schedule/Makefile]
+ [src/vm/jit/sparc64/Makefile]
+ [src/vm/jit/sparc64/linux/Makefile]
[src/vm/jit/tools/Makefile]
[src/vm/jit/verify/Makefile]
[src/vm/jit/x86_64/Makefile]
[tests/regression/codepatching/Makefile]
[tests/regression/native/Makefile])
+
+dnl now configure subpackages with OPT_CFLAGS and ARCH_CFLAGS
+export OPT_CFLAGS
+export ARCH_CFLAGS
+AC_CONFIG_SUBDIRS(src/boehm-gc)
+
+
AC_OUTPUT
projects / cacao.git / blobdiff