diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-11-28 01:07:19 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-11-28 01:07:19 +0000 |
| commit | c73f3d1ce7dc236169fcb5f9149562bb50986cd9 (patch) | |
| tree | 43c6b5a0bc6561724782fed6726877d1458617ca | |
| parent | 38831b014a57718a1755ab1c3c1df08679183dfb (diff) | |
| download | llvm-c73f3d1ce7dc236169fcb5f9149562bb50986cd9.tar.gz llvm-c73f3d1ce7dc236169fcb5f9149562bb50986cd9.tar.bz2 llvm-c73f3d1ce7dc236169fcb5f9149562bb50986cd9.tar.xz | |
configure, config.h.in: Regenerate.
config.h.cmake: Synchronize to config.h.in.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145217 91177308-0d34-0410-b5e6-96231b3b80d8
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | include/llvm/Config/config.h.cmake | 3 | ||||
| -rw-r--r-- | include/llvm/Config/config.h.in | 6 |
3 files changed, 14 insertions, 11 deletions
@@ -694,7 +694,7 @@ JIT TARGET_HAS_JIT ENABLE_DOCS ENABLE_DOXYGEN -ENABLE_THREADS +LLVM_ENABLE_THREADS ENABLE_PTHREADS ENABLE_PIC ENABLE_SHARED @@ -5155,11 +5155,11 @@ else fi case "$enableval" in - yes) ENABLE_THREADS=1 + yes) LLVM_ENABLE_THREADS=1 ;; - no) ENABLE_THREADS=0 + no) LLVM_ENABLE_THREADS=0 ;; - default) ENABLE_THREADS=1 + default) LLVM_ENABLE_THREADS=1 ;; *) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-threads. Use \"yes\" or \"no\"" >&5 echo "$as_me: error: Invalid setting for --enable-threads. Use \"yes\" or \"no\"" >&2;} @@ -5167,7 +5167,7 @@ echo "$as_me: error: Invalid setting for --enable-threads. Use \"yes\" or \"no\" esac cat >>confdefs.h <<_ACEOF -#define ENABLE_THREADS $ENABLE_THREADS +#define LLVM_ENABLE_THREADS $LLVM_ENABLE_THREADS _ACEOF @@ -12812,7 +12812,7 @@ _ACEOF fi -if test "$ENABLE_THREADS" -eq 1 && test "$ENABLE_PTHREADS" -eq 1 ; then +if test "$LLVM_ENABLE_THREADS" -eq 1 && test "$ENABLE_PTHREADS" -eq 1 ; then { echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5 echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; } @@ -15525,7 +15525,7 @@ fi done -if test "$ENABLE_THREADS" -eq 1 && test "$ENABLE_PTHREADS" -eq 1 ; then +if test "$LLVM_ENABLE_THREADS" -eq 1 && test "$ENABLE_PTHREADS" -eq 1 ; then for ac_header in pthread.h do @@ -21879,7 +21879,7 @@ JIT!$JIT$ac_delim TARGET_HAS_JIT!$TARGET_HAS_JIT$ac_delim ENABLE_DOCS!$ENABLE_DOCS$ac_delim ENABLE_DOXYGEN!$ENABLE_DOXYGEN$ac_delim -ENABLE_THREADS!$ENABLE_THREADS$ac_delim +LLVM_ENABLE_THREADS!$LLVM_ENABLE_THREADS$ac_delim ENABLE_PTHREADS!$ENABLE_PTHREADS$ac_delim ENABLE_PIC!$ENABLE_PIC$ac_delim ENABLE_SHARED!$ENABLE_SHARED$ac_delim diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake index 1f9620762d..b4356b18c7 100644 --- a/include/llvm/Config/config.h.cmake +++ b/include/llvm/Config/config.h.cmake @@ -671,6 +671,9 @@ /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ #undef STAT_MACROS_BROKEN +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index b3a9590804..30afa5890b 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -30,9 +30,6 @@ /* Define if position independent code is enabled */ #undef ENABLE_PIC -/* Define if threads enabled */ -#undef ENABLE_THREADS - /* Define if timestamp information (e.g., __DATE___) is allowed */ #undef ENABLE_TIMESTAMPS @@ -552,6 +549,9 @@ /* Installation directory for documentation */ #undef LLVM_DOCSDIR +/* Define if threads enabled */ +#undef LLVM_ENABLE_THREADS + /* Installation directory for config files */ #undef LLVM_ETCDIR |