X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=autoconf%2Fconfigure.ac;h=62e6740b5245f6ba29a95e33fbba690f0f63bcff;hb=c7b6ce4af8e2c16e2f4287eedea25c426ac844a2;hp=1a3846b65cdbb2cc0471664931b9ee38bd07f1b3;hpb=68886d44b1ab3108dfeee70909b8859beea68e55;p=oota-llvm.git diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 1a3846b65cd..62e6740b524 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -30,6 +30,16 @@ then fi fi +if test -d ${srcdir}/projects/reopt +then + AC_CONFIG_SUBDIRS(projects/reopt) +fi + +if test -d ${srcdir}/projects/poolalloc +then + AC_CONFIG_SUBDIRS(projects/poolalloc) +fi + dnl Configure a header file AC_CONFIG_HEADERS(include/Config/config.h) AC_CONFIG_MAKEFILE(Makefile) @@ -83,7 +93,8 @@ AC_CONFIG_MAKEFILE(runtime/libdummy/Makefile) AC_CONFIG_MAKEFILE(runtime/libtrace/Makefile) AC_CONFIG_MAKEFILE(test/Makefile) AC_CONFIG_MAKEFILE(test/Makefile.tests) -AC_CONFIG_MAKEFILE(test/QMTestDB/QMTest/llvm.py) +AC_CONFIG_MAKEFILE(test/QMTest/llvm.py) +AC_CONFIG_MAKEFILE(test/QMTest/llvmdb.py) AC_CONFIG_MAKEFILE(test/Programs/Makefile) AC_CONFIG_MAKEFILE(test/Programs/Makefile.programs) AC_CONFIG_MAKEFILE(test/Programs/TEST.aa.Makefile) @@ -104,6 +115,7 @@ AC_CONFIG_MAKEFILE(test/Programs/External/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile.spec) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/177.mesa/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/179.art/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/183.equake/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/188.ammp/Makefile) @@ -114,6 +126,8 @@ AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/176.gcc/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/181.mcf/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/186.crafty/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/197.parser/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/252.eon/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/253.perlbmk/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/254.gap/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/255.vortex/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile) @@ -158,12 +172,6 @@ AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/sim/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/Flex/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/Larn/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/Moria-5.5.2/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/Povray31/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/m4/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile.singlesrc) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Gizmos/Makefile) @@ -178,6 +186,7 @@ AC_CONFIG_MAKEFILE(test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Regression/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Regression/C/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Regression/C++/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Regression/C++/EH/Makefile) AC_CONFIG_MAKEFILE(tools/Makefile) AC_CONFIG_MAKEFILE(tools/analyze/Makefile) AC_CONFIG_MAKEFILE(tools/bugpoint/Makefile) @@ -196,7 +205,6 @@ AC_CONFIG_MAKEFILE(utils/Makefile) AC_CONFIG_MAKEFILE(utils/Burg/Makefile) AC_CONFIG_MAKEFILE(utils/Burg/Doc/Makefile) AC_CONFIG_MAKEFILE(utils/TableGen/Makefile) -AC_CONFIG_MAKEFILE(www/docs/Makefile) AC_CONFIG_MAKEFILE(projects/Makefile) AC_CONFIG_MAKEFILE(projects/sample/Makefile) AC_CONFIG_MAKEFILE(projects/sample/Makefile.common) @@ -354,8 +362,6 @@ AC_PATH_PROG(DOT,[dot],[false]) AC_PATH_PROG(ETAGS,[etags],[false]) -AC_PATH_PROG(PURIFY,[purify],[false]) - AC_PATH_PROG(PYTHON,[python],[false]) if test ${PYTHON} = "false" then @@ -396,11 +402,11 @@ dnl ************************************************************************** dnl libelf is for sparc only; we can ignore it if we don't have it AC_CHECK_LIB(elf, elf_begin) -dnl dlopen() is required. If we don't find it, quit. -AC_SEARCH_LIBS(dlopen,dl,,AC_MSG_ERROR([dlopen() required but not found])) +dnl dlopen() is required for plugin support. +AC_SEARCH_LIBS(dlopen,dl,AC_DEFINE([HAVE_DLOPEN],[1],[Define if dlopen() is available on this platform.]),AC_MSG_WARN([dlopen() not found - disabling plugin support])) dnl mallinfo is optional; the code can compile (minus features) without it -AC_SEARCH_LIBS(mallinfo,malloc,AC_DEFINE([HAVE_MALLINFO],[1])) +AC_SEARCH_LIBS(mallinfo,malloc,AC_DEFINE([HAVE_MALLINFO],[1],[Define if mallinfo() is available on this platform.])) dnl dnl The math libraries are used by the test code, but not by the actual LLVM @@ -439,7 +445,7 @@ AC_C_CONST AC_C_INLINE dnl Check for machine endian-ness -AC_C_BIGENDIAN(AC_DEFINE([ENDIAN_BIG]),AC_DEFINE(ENDIAN_LITTLE)) +AC_C_BIGENDIAN(AC_DEFINE([ENDIAN_BIG],[],[Define if the machine is Big-Endian]),AC_DEFINE([ENDIAN_LITTLE],[],[Define if the machine is Little-Endian])) dnl Check for types AC_TYPE_PID_T @@ -449,6 +455,9 @@ AC_CHECK_TYPES([uint64_t],,AC_MSG_ERROR([Type uint64_t required but not found])) AC_HEADER_TIME AC_STRUCT_TM +dnl Check for various C features +AC_C_PRINTF_A + dnl Check for C++ extensions AC_CXX_HAVE_EXT_HASH_MAP AC_CXX_HAVE_EXT_HASH_SET @@ -471,7 +480,7 @@ then fi AC_HEADER_MMAP_ANONYMOUS AC_TYPE_SIGNAL -AC_CHECK_FUNCS(getcwd gettimeofday strcspn strdup strerror strspn strstr strtod strtol) +AC_CHECK_FUNCS(getcwd gettimeofday strcspn strdup strerror strspn strstr strtod strtol strtoq strtoll) dnl dnl Need to check mmap for MAP_PRIVATE, MAP_ANONYMOUS, MAP_ANON, MAP_FIXED @@ -511,11 +520,24 @@ else fi dnl Spec Benchmarks -AC_ARG_ENABLE(spec,AC_HELP_STRING([--enable-spec],[Compile SPEC benchmarks (default is NO)]),,enableval=no) +AC_ARG_ENABLE(spec2000,AC_HELP_STRING([--enable-spec],[Compile SPEC 2000 benchmarks (default is NO)]),,enableval=no) if test ${enableval} = "no" then - AC_SUBST(USE_SPEC,[[]]) + if test -d /home/vadve/shared/benchmarks/speccpu2000/benchspec + then + AC_SUBST(SPEC_ROOT,[/home/vadve/shared/benchmarks/speccpu2000/benchspec]) + AC_SUBST(USE_SPEC,[[USE_SPEC=1]]) + else + AC_SUBST(USE_SPEC,[[]]) + AC_SUBST(SPEC_ROOT,[]) + fi else + if test ${enableval} = "" + then + AC_SUBST(SPEC_ROOT,[/home/vadve/shared/benchmarks/speccpu2000/benchspec]) + else + AC_SUBST(SPEC_ROOT,[${enableval}]) + fi AC_SUBST(USE_SPEC,[[USE_SPEC=1]]) fi @@ -562,9 +584,6 @@ dnl ************************************************************************** dnl * Set the location of various third-party software packages dnl ************************************************************************** -dnl Location of SPEC benchmarks -AC_ARG_WITH(spec,AC_HELP_STRING([--with-spec],[Location of SPEC benchmarks]),AC_SUBST(SPEC_ROOT,[$withval]),AC_SUBST(SPEC_ROOT,[/home/vadve/shared/benchmarks/speccpu2000/benchspec])) - dnl Location of the LLVM C front end AC_ARG_WITH(llvmgccdir,AC_HELP_STRING([--with-llvmgccdir],[Location of LLVM GCC front-end]),AC_SUBST(LLVMGCCDIR,[$withval]))