X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=autoconf%2Fconfigure.ac;h=7e710080ea070eb0a1dc360c42363d86ee4a62f6;hp=5be25af2adf2a2d7b98779b6fb41fca9a8ca7bb3;hb=070764ee855463a2c9224138bc056fa4f2ef06da;hpb=244acf3a4b172657924d21bbb3a65f6388cb68bd diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 5be25af2adf..7e710080ea0 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -31,14 +31,14 @@ dnl=== dnl===-----------------------------------------------------------------------=== dnl Initialize autoconf and define the package name, version number and dnl address for reporting bugs. -AC_INIT([LLVM],[3.4svn],[http://llvm.org/bugs/]) +AC_INIT([LLVM],[3.5svn],[http://llvm.org/bugs/]) AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API]) -AC_DEFINE([LLVM_VERSION_MINOR], [4], [Minor version of the LLVM API]) +AC_DEFINE([LLVM_VERSION_MINOR], [5], [Minor version of the LLVM API]) dnl Provide a copyright substitution and ensure the copyright notice is included dnl in the output of --version option of the generated configure script. -AC_SUBST(LLVM_COPYRIGHT,["Copyright (c) 2003-2013 University of Illinois at Urbana-Champaign."]) -AC_COPYRIGHT([Copyright (c) 2003-2013 University of Illinois at Urbana-Champaign.]) +AC_SUBST(LLVM_COPYRIGHT,["Copyright (c) 2003-2014 University of Illinois at Urbana-Champaign."]) +AC_COPYRIGHT([Copyright (c) 2003-2014 University of Illinois at Urbana-Champaign.]) dnl Indicate that we require autoconf 2.60 or later. AC_PREREQ(2.60) @@ -61,13 +61,13 @@ fi dnl Default to empty (i.e. assigning the null string to) CFLAGS and CXXFLAGS, dnl instead of the autoconf default (for example, '-g -O2' for CC=gcc). -${CFLAGS=} -${CXXFLAGS=} +: ${CFLAGS=} +: ${CXXFLAGS=} dnl We need to check for the compiler up here to avoid anything else dnl starting with a different one. -AC_PROG_CC(clang llvm-gcc gcc) -AC_PROG_CXX(clang++ llvm-g++ g++) +AC_PROG_CC(clang gcc) +AC_PROG_CXX(clang++ g++) AC_PROG_CPP dnl If CXX is Clang, check that it can find and parse C++ standard library @@ -96,6 +96,25 @@ if test "$CXX" = "clang++" ; then AC_LANG_POP([C++]) fi +dnl Set up variables that track whether the host compiler is GCC or Clang where +dnl we can effectively sanity check them. We don't try to sanity check all the +dnl other possible compilers. +AC_MSG_CHECKING([whether GCC or Clang is our host compiler]) +AC_LANG_PUSH([C++]) +llvm_cv_cxx_compiler=unknown +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if ! __clang__ + #error + #endif + ]])], + llvm_cv_cxx_compiler=clang, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if ! __GNUC__ + #error + #endif + ]])], + llvm_cv_cxx_compiler=gcc, [])]) +AC_LANG_POP([C++]) +AC_MSG_RESULT([${llvm_cv_cxx_compiler}]) + dnl Configure all of the projects present in our source tree. While we could dnl just AC_CONFIG_SUBDIRS on the set of directories in projects that have a dnl configure script, that usage of the AC_CONFIG_SUBDIRS macro is deprecated. @@ -109,11 +128,6 @@ dnl created before running the configure scripts of projects that depend upon dnl them. dnl -dnl Several projects use llvm-gcc, so configure that first -if test -d ${srcdir}/projects/llvm-gcc ; then - AC_CONFIG_SUBDIRS([projects/llvm-gcc]) -fi - dnl Several projects use the LLVM test suite, so configure it next. if test -d ${srcdir}/projects/test-suite ; then AC_CONFIG_SUBDIRS([projects/test-suite]) @@ -140,15 +154,8 @@ do if test -d ${srcdir}/projects/${i} ; then case ${i} in sample) AC_CONFIG_SUBDIRS([projects/sample]) ;; - privbracket) AC_CONFIG_SUBDIRS([projects/privbracket]) ;; - llvm-stacker) AC_CONFIG_SUBDIRS([projects/llvm-stacker]) ;; - llvm-reopt) AC_CONFIG_SUBDIRS([projects/llvm-reopt]);; - llvm-java) AC_CONFIG_SUBDIRS([projects/llvm-java]) ;; - llvm-tv) AC_CONFIG_SUBDIRS([projects/llvm-tv]) ;; safecode) AC_CONFIG_SUBDIRS([projects/safecode]) ;; - llvm-kernel) AC_CONFIG_SUBDIRS([projects/llvm-kernel]) ;; compiler-rt) ;; - llvm-gcc) ;; test-suite) ;; llvm-test) ;; poolalloc) ;; @@ -451,9 +458,6 @@ fi AC_SUBST(HOST_ARCH,$host_arch) -dnl Check for the endianness of the target -AC_C_BIGENDIAN(AC_SUBST([ENDIAN],[big]),AC_SUBST([ENDIAN],[little])) - dnl Check for build platform executable suffix if we're cross-compiling if test "$cross_compiling" = yes; then AC_SUBST(LLVM_CROSS_COMPILING, [1]) @@ -503,6 +507,87 @@ case "$enableval" in *) AC_MSG_ERROR([Invalid setting for --enable-libcpp. Use "yes" or "no"]) ;; esac +dnl Check both GCC and Clang for sufficiently modern versions. These checks can +dnl be bypassed by passing a flag if necessary on a platform. We have to do +dnl these checks here so that we have the configuration of the standard C++ +dnl library finished. +AC_ARG_ENABLE(compiler-version-checks, + AS_HELP_STRING([--enable-compiler-version-checks], + [Check the version of the host compiler (default is YES)]),, + enableval=default) +case "$enableval" in + no) + ;; + yes|default) + AC_LANG_PUSH([C++]) + case "$llvm_cv_cxx_compiler" in + clang) + AC_MSG_CHECKING([whether Clang is new enough]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +#if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 1) +#error This version of Clang is too old to build LLVM +#endif +]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([ +The selected Clang compiler is not new enough to build LLVM. Please upgrade to +Clang 3.1. You may pass --disable-compiler-version-checks to configure to +bypass these sanity checks.])]) + + dnl Note that libstdc++4.6 is known broken for C++11 builds. The errors + dnl are sometimes deeply confusing though. Here we test for an obvious + dnl incomplete feature in 4.6's standard library that was completed in + dnl 4.7's. We also have to disable this test if 'ENABLE_LIBCPP' is set + dnl because the enable flags don't actually fix CXXFLAGS, they rely on + dnl that happening in the Makefile. + if test "$ENABLE_LIBCPP" -eq 0 ; then + AC_MSG_CHECKING([whether Clang will select a modern C++ standard library]) + llvm_cv_old_cxxflags="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++0x" + AC_LINK_IFELSE([AC_LANG_SOURCE([[ +#include +std::atomic x(0.0f); +int main() { return (float)x; } +]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([ +We detected a missing feature in the standard C++ library that was known to be +missing in libstdc++4.6 and implemented in libstdc++4.7. There are numerous +C++11 problems with 4.6's library, and we don't support GCCs or libstdc++ older +than 4.7. You will need to update your system and ensure Clang uses the newer +standard library. + +If this error is incorrect or you need to force things to work, you may pass +'--disable-compiler-version-checks' to configure to bypass this test.])]) + CXXFLAGS="$llvm_cv_old_cxxflags" + fi + ;; + gcc) + AC_MSG_CHECKING([whether GCC is new enough]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) +#error This version of GCC is too old to build LLVM +#endif +]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([ +The selected GCC C++ compiler is not new enough to build LLVM. Please upgrade +to GCC 4.7. You may pass --disable-compiler-version-checks to configure to +bypass these sanity checks.])]) + ;; + unknown) + ;; + esac + AC_LANG_POP([C++]) + ;; + *) + AC_MSG_ERROR([Invalid setting for --enable-compiler-version-checks. Use "yes" or "no"]) + ;; +esac + dnl --enable-cxx11 : check whether or not to use -std=c++11 on the command line AC_ARG_ENABLE(cxx11, AS_HELP_STRING([--enable-cxx11], @@ -551,7 +636,12 @@ AC_ARG_ENABLE(clang-static-analyzer, enableval="yes") case "$enableval" in yes) AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[1]) ;; - no) AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[0]) ;; + no) + if test ${clang_arcmt} != "no" ; then + AC_MSG_ERROR([Cannot enable clang ARC Migration Tool while disabling static analyzer.]) + fi + AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[0]) + ;; default) AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[1]);; *) AC_MSG_ERROR([Invalid setting for --enable-clang-static-analyzer. Use "yes" or "no"]) ;; esac @@ -795,20 +885,37 @@ esac AC_DEFINE_UNQUOTED([ENABLE_TIMESTAMPS],$ENABLE_TIMESTAMPS, [Define if timestamp information (e.g., __DATE__) is allowed]) -dnl Enable embedding timestamp information into build. +dnl Enable support for showing backtraces. +AC_ARG_ENABLE(backtraces, AS_HELP_STRING( + [--enable-backtraces], + [Enable embedding backtraces on crash (default is YES)]), + [case "$enableval" in + yes) llvm_cv_enable_backtraces="yes" ;; + no) llvm_cv_enable_backtraces="no" ;; + *) AC_MSG_ERROR([Invalid setting for --enable-backtraces. Use "yes" or "no"]) ;; + esac], + llvm_cv_enable_backtraces="yes") +if test "$llvm_cv_enable_backtraces" = "yes" ; then + AC_DEFINE([ENABLE_BACKTRACES],[1], + [Define if you want backtraces on crash]) +fi -AC_ARG_ENABLE(backtraces, - AS_HELP_STRING([--enable-backtraces], - [Enable embedding backtraces on crash (default is YES)]),, - enableval=default) -case "$enableval" in - yes) AC_SUBST(ENABLE_BACKTRACES,[1]) ;; - no) AC_SUBST(ENABLE_BACKTRACES,[0]) ;; - default) AC_SUBST(ENABLE_BACKTRACES,[1]) ;; - *) AC_MSG_ERROR([Invalid setting for --enable-backtraces. Use "yes" or "no"]) ;; -esac -AC_DEFINE_UNQUOTED([ENABLE_BACKTRACES],$ENABLE_BACKTRACES, - [Define if you want backtraces on crash]) +dnl Enable installing platform specific signal handling overrides, for improved +dnl CrashRecovery support or interaction with crash reporting software. This +dnl support may be inappropriate for some clients embedding LLVM as a library. +AC_ARG_ENABLE(crash-overrides, AS_HELP_STRING( + [--enable-crash-overrides], + [Enable crash handling overrides (default is YES)]), + [case "$enableval" in + yes) llvm_cv_enable_crash_overrides="yes" ;; + no) llvm_cv_enable_crash_overrides="no" ;; + *) AC_MSG_ERROR([Invalid setting for --enable-crash-overrides. Use "yes" or "no"]) ;; + esac], + llvm_cv_enable_crash_overrides="yes") +if test "$llvm_cv_enable_crash_overrides" = "yes" ; then + AC_DEFINE([ENABLE_CRASH_OVERRIDES],[1], + [Define to enable crash handling overrides]) +fi dnl Allow specific targets to be specified for building (or not) TARGETS_TO_BUILD="" @@ -1072,6 +1179,17 @@ AC_ARG_WITH(bug-report-url, AC_DEFINE_UNQUOTED(BUG_REPORT_URL,"$withval", [Bug report URL.]) +dnl --enable-terminfo: check whether the user wants to control use of terminfo: +AC_ARG_ENABLE(terminfo,AS_HELP_STRING( + [--enable-terminfo], + [Query the terminfo database if available (default is YES)]), + [case "$enableval" in + yes) llvm_cv_enable_terminfo="yes" ;; + no) llvm_cv_enable_terminfo="no" ;; + *) AC_MSG_ERROR([Invalid setting for --enable-terminfo. Use "yes" or "no"]) ;; + esac], + llvm_cv_enable_terminfo="yes") + dnl --enable-libffi : check whether the user wants to turn off libffi: AC_ARG_ENABLE(libffi,AS_HELP_STRING( --enable-libffi,[Check for the presence of libffi (default is NO)]), @@ -1344,12 +1462,13 @@ else fi AC_MSG_CHECKING([for python >= 2.5]) -ac_python_version=`$PYTHON -c 'import sys; print sys.version.split()[[0]]'` +ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2` ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1` ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2` ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3` -if test "$ac_python_version_major" -eq "2" \ - && test "$ac_python_version_minor" -ge "5" ; then +if test "$ac_python_version_major" -gt "2" || \ + (test "$ac_python_version_major" -eq "2" && \ + test "$ac_python_version_minor" -ge "5") ; then AC_MSG_RESULT([$PYTHON ($ac_python_version)]) else AC_MSG_RESULT([not found]) @@ -1366,6 +1485,7 @@ AC_CHECK_LIB(m,sin) if test "$llvm_cv_os_type" = "MingW" ; then AC_CHECK_LIB(imagehlp, main) AC_CHECK_LIB(psapi, main) + AC_CHECK_LIB(shell32, main) fi dnl dlopen() is required for plugin support. @@ -1378,6 +1498,14 @@ dnl macros to detect whether clock_gettime is available, this just finds the dnl right libraries to link with. AC_SEARCH_LIBS(clock_gettime,rt) +dnl The curses library is optional; used for querying terminal info +if test "$llvm_cv_enable_terminfo" = "yes" ; then + dnl We need the has_color functionality in curses for it to be useful. + AC_SEARCH_LIBS(setupterm,tinfo terminfo curses ncurses ncursesw, + AC_DEFINE([HAVE_TERMINFO],[1], + [Define if the setupterm() function is supported this platform.])) +fi + dnl libffi is optional; used to call external functions from the interpreter if test "$llvm_cv_enable_libffi" = "yes" ; then AC_SEARCH_LIBS(ffi_call,ffi,AC_DEFINE([HAVE_FFI_CALL],[1], @@ -1926,7 +2054,6 @@ AC_CONFIG_MAKEFILE(Makefile) AC_CONFIG_MAKEFILE(Makefile.common) AC_CONFIG_MAKEFILE(examples/Makefile) AC_CONFIG_MAKEFILE(lib/Makefile) -AC_CONFIG_MAKEFILE(runtime/Makefile) AC_CONFIG_MAKEFILE(test/Makefile) AC_CONFIG_MAKEFILE(test/Makefile.tests) AC_CONFIG_MAKEFILE(unittests/Makefile)