Always pass the root node to ComplexPattern isel matching function.

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

diff --git a/Makefile.config.in b/Makefile.config.in
index 92b4e3ff7e0802ba181ecb6a927b36b072ad608c..2652db3bb9f629feaded1ef3f902a8165f6b8e20 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -36,13 +36,13 @@ LLVM_CONFIGTIME   := @LLVM_CONFIGTIME@
 PWD := @BINPWD@
 # Set the project name to LLVM if its not defined
 ifndef PROJECT_NAME
-PROJECT_NAME := LLVM
+PROJECT_NAME := $(LLVMPackageName)
 endif
 
 PROJ_OBJ_DIR  := $(shell $(PWD))
 PROJ_OBJ_ROOT := $(shell cd $(PROJ_OBJ_DIR)/$(LEVEL); $(PWD))
 
-ifeq ($(PROJECT_NAME),LLVM)
+ifeq ($(PROJECT_NAME),llvm)
 LLVM_SRC_ROOT   := $(shell cd @abs_top_srcdir@; $(PWD))
 LLVM_OBJ_ROOT   := $(shell cd @abs_top_builddir@; $(PWD))
 PROJ_SRC_ROOT   := $(shell cd $(LLVM_SRC_ROOT); $(PWD))
@@ -174,7 +174,11 @@ LIBS       := @LIBS@
 LLVMGCCDIR := @LLVMGCCDIR@
 
 # Determine the target for which LLVM should generate code.
+ifeq (@LLVMGCC_MAJVERS@,3)
 LLVMGCCARCH := @target@/3.4-llvm
+else
+LLVMGCCARCH := @target@/@LLVMGCC_VERSION@
+endif
 
 # Full pathnames of LLVM C/C++ front-end 'cc1' and 'cc1plus' binaries:
 LLVMGCC  := @LLVMGCC@
@@ -233,3 +237,14 @@ EXEEXT = @EXEEXT@
 
 # Things we just assume are "there"
 ECHO := echo
+
+# Get the options for causing archives to link all their content instead of
+# just missing symbols, and the inverse of that. This is used for certain LLVM
+# tools that permit loadable modules. It ensures that the LLVM symbols will be
+# available to those loadable modules.
+LINKALL := @LINKALL@
+NOLINKALL := @NOLINKALL@
+
+# Get the value of HUGE_VAL_SANITY which will be either "yes" or "no" depending
+# on the check.
+HUGE_VAL_SANITY = @HUGE_VAL_SANITY@