For PR814:

[oota-llvm.git] / Makefile.config.in

diff --git a/Makefile.config.in b/Makefile.config.in
index ad6be2bb759cb74ef7f9fce5ad7aa086a99e18a9..feaf81544df88f1f8f35b2263259f41cd0b42b31 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -97,12 +97,22 @@ OS=@OS@
 # Target hardware architecture
 ARCH=@ARCH@
 
+# Indicates, whether we're cross-compiling LLVM or not
+LLVM_CROSS_COMPILING=@LLVM_CROSS_COMPILING@
+
+# Executable file extension for build platform (mainly for
+# tablegen call if we're cross-compiling).
+BUILD_EXEEXT=@BUILD_EXEEXT@
+
 # Target triple (cpu-vendor-os) for which we should generate code
 TARGET_TRIPLE=@target@
 
 # Targets that we should build
 TARGETS_TO_BUILD=@TARGETS_TO_BUILD@
 
+# Extra options to compile LLVM with
+EXTRA_OPTIONS=@EXTRA_OPTIONS@
+
 # Endian-ness of the target
 ENDIAN=@ENDIAN@
 
@@ -178,11 +188,17 @@ OBJ_ROOT := .
 # These are options that can either be enabled here, or can be enabled on the
 # make command line (ie, make ENABLE_PROFILING=1):
 
-# When ENABLE_OPTIMIZED is enabled, Release builds of all of the LLVM code are
-# turned on, and Debug builds are turned off.
+# When ENABLE_OPTIMIZED is enabled, LLVM code is optimized and output is put
+# into the "Release" directories. Otherwise, LLVM code is not optimized and 
+# output is put in the "Debug" directories.
 #ENABLE_OPTIMIZED = 1
 @ENABLE_OPTIMIZED@
 
+# When DISABLE_ASSERTIONS is enabled, builds of all of the LLVM code will 
+# exclude assertion checks, otherwise they are included.
+#DISABLE_ASSERTIONS = 1
+@DISABLE_ASSERTIONS@
+
 # When DEBUG_RUNTIME is enabled, the runtime libraries will retain debug
 # symbols.
 #DEBUG_RUNTIME = 1
@@ -195,6 +211,9 @@ OBJ_ROOT := .
 # When ENABLE_DOXYGEN is enabled, the doxygen documentation will be built
 ENABLE_DOXYGEN = @ENABLE_DOXYGEN@
 
+# Do we want to enable threads?
+ENABLE_THREADS := @ENABLE_THREADS@
+
 # This option tells the Makefiles to produce verbose output.
 # It essentially prints the commands that make is executing
 #VERBOSE = 1
@@ -202,10 +221,10 @@ ENABLE_DOXYGEN = @ENABLE_DOXYGEN@
 # Enable JIT for this platform
 TARGET_HAS_JIT = @TARGET_HAS_JIT@
 
-# Shared library extension for this platform.
+# Shared library extension for host platform.
 SHLIBEXT = @SHLIBEXT@
 
-# Executable file extension for this platform.
+# Executable file extension for host platform.
 EXEEXT = @EXEEXT@
 
 # Things we just assume are "there"