llvm-config: Replace with C++ version (was llvm-config-2).

   - Another reapply of r144300, with hopefully one last fix.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145623 91177308-0d34-0410-b5e6-96231b3b80d8

CMakeLists.txt

@@ -230,7 +230,7 @@ endif()
 
 set(LLVMBUILDTOOL "${LLVM_MAIN_SRC_DIR}/utils/llvm-build/llvm-build")
 set(LLVMCONFIGLIBRARYDEPENDENCIESINC
-  "${LLVM_BINARY_DIR}/tools/llvm-config-2/LibraryDependencies.inc")
+  "${LLVM_BINARY_DIR}/tools/llvm-config/LibraryDependencies.inc")
 set(LLVMBUILDCMAKEFRAG
   "${LLVM_BINARY_DIR}/LLVMBuild.cmake")
 message(STATUS "Constructing LLVMBuild project information")

Makefile

@@ -27,11 +27,11 @@ LEVEL := .
 ifneq ($(findstring llvmCore, $(RC_ProjectName)),llvmCore)  # Normal build (not "Apple-style").
 
 ifeq ($(BUILD_DIRS_ONLY),1)
-  DIRS := lib/Support lib/TableGen utils tools/llvm-config-2
+  DIRS := lib/Support lib/TableGen utils tools/llvm-config
   OPTIONAL_DIRS := tools/clang/utils/TableGen
 else
   DIRS := lib/Support lib/TableGen utils lib/VMCore lib tools/llvm-shlib \
-          tools/llvm-config tools/llvm-config-2 tools runtime docs unittests
+          tools/llvm-config tools runtime docs unittests
   OPTIONAL_DIRS := projects bindings
 endif
 

Makefile.rules

@@ -79,7 +79,7 @@ LLVMBuildTool	:= $(PROJ_SRC_ROOT)/utils/llvm-build/llvm-build
 # The files we are going to generate using llvm-build.
 LLVMBuildMakeFrag := $(PROJ_OBJ_ROOT)/Makefile.llvmbuild
 LLVMConfigLibraryDependenciesInc := \
-	$(PROJ_OBJ_ROOT)/tools/llvm-config-2/LibraryDependencies.inc
+	$(PROJ_OBJ_ROOT)/tools/llvm-config/LibraryDependencies.inc
 
 # This is for temporary backwards compatibility.
 ifndef TARGET_NATIVE_ARCH
@@ -528,9 +528,9 @@ ifndef LLVM_TBLGEN
   endif
 endif
 ifeq ($(LLVM_CROSS_COMPILING),1)
-  LLVM_CONFIG := $(BuildLLVMToolDir)/llvm-config-2$(BUILD_EXEEXT)
+  LLVM_CONFIG := $(BuildLLVMToolDir)/llvm-config$(BUILD_EXEEXT)
 else
-  LLVM_CONFIG := $(LLVMToolDir)/llvm-config-2$(EXEEXT)
+  LLVM_CONFIG := $(LLVMToolDir)/llvm-config$(EXEEXT)
 endif
 ifndef LLVMLD
 LLVMLD    := $(LLVMToolDir)/llvm-ld$(EXEEXT)

autoconf/configure.ac

@@ -1578,9 +1578,6 @@ if test -f ${srcdir}/tools/clang/README.txt; then
   AC_CONFIG_FILES([tools/clang/docs/doxygen.cfg])
 fi
 
-dnl Do the first stage of configuration for llvm-config.in.
-AC_CONFIG_FILES([tools/llvm-config/llvm-config.in])
-
 dnl OCaml findlib META file
 AC_CONFIG_FILES([bindings/ocaml/llvm/META.llvm])
 

configure

@@ -21100,7 +21100,7 @@ if test -f ${srcdir}/tools/clang/README.txt; then
 
 fi
 
-ac_config_files="$ac_config_files tools/llvm-config/llvm-config.in"
+
 
 
 ac_config_files="$ac_config_files bindings/ocaml/llvm/META.llvm"

tools/CMakeLists.txt

@@ -11,16 +11,9 @@ if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/polly/CMakeLists.txt )
 endif( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/polly/CMakeLists.txt )
 
 if( NOT WIN32 OR MSYS OR CYGWIN )
-  # It is useful to build llvm-config before the other tools, so we
-  # have a fresh LibDeps.txt for regenerating the hard-coded library
-  # dependencies. llvm-config/CMakeLists.txt takes care of this but we
-  # must keep llvm-config as the first entry on the list of tools to
-  # be built.
-  add_subdirectory(llvm-config)
-
-  # We currently require 'sed' to build llvm-config-2, so don't try to build it
+  # We currently require 'sed' to build llvm-config, so don't try to build it
   # on pure Win32.
-  add_subdirectory(llvm-config-2)
+  add_subdirectory(llvm-config)
 endif()
 
 add_subdirectory(opt)

tools/Makefile

@@ -34,7 +34,7 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \
                  bugpoint llvm-bcanalyzer llvm-stub \
                  llvm-diff macho-dump llvm-objdump \
 	         llvm-rtdyld llvm-dwarfdump llvm-cov \
-	         llvm-size llvm-config-2
+	         llvm-size
 
 # Let users override the set of tools to build from the command line.
 ifdef ONLY_TOOLS