X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=autoconf%2Fconfigure.ac;h=3a3dfd881c0330b7207aca28d81913575cec15b4;hb=6621ed94cc6fc1daba42171753d1b54fd7fc6e86;hp=6fac355742e33cb6a5e3040d1767028d1aa05a56;hpb=80ead3133ae3b6eb0517c3bca406574bef135a74;p=oota-llvm.git diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 6fac355742e..3a3dfd881c0 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -40,7 +40,6 @@ AC_CONFIG_MAKEFILE(test/Programs/Makefile) AC_CONFIG_MAKEFILE(test/Programs/Makefile.programs) AC_CONFIG_MAKEFILE(test/Programs/TEST.aa.Makefile) AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.report) -AC_CONFIG_MAKEFILE(test/Programs/TEST.micro.report) AC_CONFIG_MAKEFILE(test/Programs/TEST.aa.report) AC_CONFIG_MAKEFILE(test/Programs/TEST.example.Makefile) AC_CONFIG_MAKEFILE(test/Programs/TEST.nightly.Makefile) @@ -51,10 +50,11 @@ AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.Makefile) AC_CONFIG_MAKEFILE(test/Programs/TEST.jit.report) AC_CONFIG_MAKEFILE(test/Programs/TEST.typesafe.Makefile) AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.gnuplot) -AC_CONFIG_MAKEFILE(test/Programs/TEST.micro.Makefile) +AC_CONFIG_MAKEFILE(test/Programs/TEST.vtl.Makefile) 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/Makefile.spec2000) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile.spec95) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile.multisrc) @@ -73,6 +73,7 @@ AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/pifft/Makefile AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/pifft/test.in) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile.singlesrc) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile) AC_CONFIG_MAKEFILE(tools/Makefile) AC_CONFIG_MAKEFILE(utils/Makefile) AC_CONFIG_MAKEFILE(projects/Makefile) @@ -222,7 +223,8 @@ AC_SEARCH_LIBS(mallinfo,malloc,AC_DEFINE([HAVE_MALLINFO],[1],[Define if mallinfo dnl pthread locking functions are optional - but llvm will not be thread-safe dnl without locks. -AC_SEARCH_LIBS(pthread_mutex_lock,pthread,AC_DEFINE(HAVE_PTHREAD_MUTEX_LOCK,1,[Define if PThread mutexes (e.g., pthread_mutex_lock) are available in the system's thread library.])) +AC_SEARCH_LIBS(pthread_mutex_lock,pthread,HAVE_PTHREAD_MUTEX_LOCK=1,HAVE_PTHREAD_MUTEX_LOCK=0) +AC_SUBST(HAVE_PTHREAD_MUTEX_LOCK) dnl Checks for header files. dnl We don't check for ancient stuff or things that are guaranteed to be there @@ -233,6 +235,18 @@ AC_HEADER_SYS_WAIT dnl Checks for POSIX and other various system-specific header files AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h malloc.h sys/mman.h sys/resource.h dlfcn.h link.h execinfo.h) +dnl Check for things that need to be included in public headers, and so +dnl for which we may not have access to a HAVE_* preprocessor #define. +dnl (primarily used in DataTypes.h) +AC_CHECK_HEADER([sys/types.h], + [INCLUDE_SYS_TYPES_H='#include '], + [INCLUDE_SYS_TYPES_H='']) +AC_SUBST(INCLUDE_SYS_TYPES_H) +AC_CHECK_HEADER([inttypes.h], + [INCLUDE_INTTYPES_H='#include '], + [INCLUDE_INTTYPES_H='']) +AC_SUBST(INCLUDE_INTTYPES_H) + dnl Check for types AC_TYPE_PID_T AC_TYPE_SIZE_T @@ -268,7 +282,7 @@ then fi AC_HEADER_MMAP_ANONYMOUS AC_TYPE_SIGNAL -AC_CHECK_FUNCS(getcwd gettimeofday strdup strtoq strtoll backtrace) +AC_CHECK_FUNCS(getcwd gettimeofday strdup strtoq strtoll backtrace isatty) AC_CHECK_FUNC(mprotect,,AC_MSG_ERROR([Function mprotect() required but not found])) dnl Determine if the linker supports the -R option. @@ -290,20 +304,20 @@ if test ${enableval} = "no" then 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]]) + AC_SUBST(SPEC2000_ROOT,[/home/vadve/shared/benchmarks/speccpu2000/benchspec]) + AC_SUBST(USE_SPEC2000,[[USE_SPEC2000=1]]) else - AC_SUBST(USE_SPEC,[[]]) - AC_SUBST(SPEC_ROOT,[]) + AC_SUBST(USE_SPEC2000,[[]]) + AC_SUBST(SPEC2000_ROOT,[]) fi else if test ${enableval} = "" then - AC_SUBST(SPEC_ROOT,[/home/vadve/shared/benchmarks/speccpu2000/benchspec]) + AC_SUBST(SPEC2000_ROOT,[/home/vadve/shared/benchmarks/speccpu2000/benchspec]) else - AC_SUBST(SPEC_ROOT,[${enableval}]) + AC_SUBST(SPEC2000_ROOT,[${enableval}]) fi - AC_SUBST(USE_SPEC,[[USE_SPEC=1]]) + AC_SUBST(USE_SPEC2000,[[USE_SPEC2000=1]]) fi dnl Spec 95 Benchmarks @@ -332,9 +346,9 @@ dnl Povray External Benchmark AC_ARG_ENABLE(povray,AC_HELP_STRING([--enable-povray],[Compile Povray benchmark (default is NO)]),,enableval=no) if test ${enableval} = "no" then - if test -d /home/vadve/criswell/Downloads/povray-3.50c + if test -d /home/vadve/shared/benchmarks/povray31 then - AC_SUBST(POVRAY_ROOT,[/home/vadve/criswell/Downloads/povray-3.50c]) + AC_SUBST(POVRAY_ROOT,[/home/vadve/shared/benchmarks/povray31]) AC_SUBST(USE_POVRAY,[[USE_POVRAY=1]]) else AC_SUBST(USE_POVRAY,[[]]) @@ -343,7 +357,7 @@ then else if test ${enableval} = "" then - AC_SUBST(POVRAY_ROOT,[/home/vadve/criswell/Downloads/povray-3.50c]) + AC_SUBST(POVRAY_ROOT,[/home/vadve/shared/benchmarks/povray31]) else AC_SUBST(POVRAY_ROOT,[${enableval}]) fi @@ -445,9 +459,11 @@ AC_DEFINE_UNQUOTED(SHLIBEXT,"$SHLIBEXT", dnl Create the output files AC_OUTPUT(Makefile.config - include/Support/iterator + include/Support/DataTypes.h + include/Support/ThreadSupport.h include/Support/hash_map - include/Support/hash_set) + include/Support/hash_set + include/Support/iterator) dnl Warn loudly if llvm-gcc was not obviously working if test $llvmgccwarn = yes