diff --git a/llvm/Makefile.config.in b/llvm/Makefile.config.in
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
diff --git a/llvm/autoconf/AutoRegen.sh b/llvm/autoconf/AutoRegen.sh
diff --git a/llvm/autoconf/ExportMap.map b/llvm/autoconf/ExportMap.map
diff --git a/llvm/autoconf/LICENSE.TXT b/llvm/autoconf/LICENSE.TXT
diff --git a/llvm/autoconf/README.TXT b/llvm/autoconf/README.TXT
diff --git a/llvm/autoconf/config.sub b/llvm/autoconf/config.sub
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
diff --git a/llvm/autoconf/install-sh b/llvm/autoconf/install-sh
diff --git a/llvm/autoconf/m4/build_exeext.m4 b/llvm/autoconf/m4/build_exeext.m4
diff --git a/llvm/autoconf/m4/c_printf_a.m4 b/llvm/autoconf/m4/c_printf_a.m4
diff --git a/llvm/autoconf/m4/check_gnu_make.m4 b/llvm/autoconf/m4/check_gnu_make.m4
diff --git a/llvm/autoconf/m4/config_makefile.m4 b/llvm/autoconf/m4/config_makefile.m4
diff --git a/llvm/autoconf/m4/config_project.m4 b/llvm/autoconf/m4/config_project.m4
diff --git a/llvm/autoconf/m4/cxx_flag_check.m4 b/llvm/autoconf/m4/cxx_flag_check.m4
diff --git a/llvm/autoconf/m4/define_subst.m4 b/llvm/autoconf/m4/define_subst.m4
diff --git a/llvm/autoconf/m4/find_std_program.m4 b/llvm/autoconf/m4/find_std_program.m4
diff --git a/llvm/autoconf/m4/func_mmap_file.m4 b/llvm/autoconf/m4/func_mmap_file.m4
diff --git a/llvm/autoconf/m4/header_mmap_anonymous.m4 b/llvm/autoconf/m4/header_mmap_anonymous.m4
diff --git a/llvm/autoconf/m4/huge_val.m4 b/llvm/autoconf/m4/huge_val.m4
diff --git a/llvm/autoconf/m4/link_options.m4 b/llvm/autoconf/m4/link_options.m4
diff --git a/llvm/autoconf/m4/linux_mixed_64_32.m4 b/llvm/autoconf/m4/linux_mixed_64_32.m4
diff --git a/llvm/autoconf/m4/need_dev_zero_for_mmap.m4 b/llvm/autoconf/m4/need_dev_zero_for_mmap.m4
diff --git a/llvm/autoconf/m4/sanity_check.m4 b/llvm/autoconf/m4/sanity_check.m4
diff --git a/llvm/autoconf/m4/single_cxx_check.m4 b/llvm/autoconf/m4/single_cxx_check.m4
diff --git a/llvm/autoconf/m4/visibility_inlines_hidden.m4 b/llvm/autoconf/m4/visibility_inlines_hidden.m4
diff --git a/llvm/autoconf/missing b/llvm/autoconf/missing
diff --git a/llvm/autoconf/mkinstalldirs b/llvm/autoconf/mkinstalldirs
diff --git a/llvm/bindings/Makefile b/llvm/bindings/Makefile
diff --git a/llvm/bindings/ocaml/Makefile b/llvm/bindings/ocaml/Makefile
diff --git a/llvm/bindings/ocaml/Makefile.ocaml b/llvm/bindings/ocaml/Makefile.ocaml
diff --git a/llvm/bindings/ocaml/all_backends/Makefile b/llvm/bindings/ocaml/all_backends/Makefile
diff --git a/llvm/bindings/ocaml/analysis/Makefile b/llvm/bindings/ocaml/analysis/Makefile
diff --git a/llvm/bindings/ocaml/backends/Makefile b/llvm/bindings/ocaml/backends/Makefile
diff --git a/llvm/bindings/ocaml/backends/Makefile.common b/llvm/bindings/ocaml/backends/Makefile.common
diff --git a/llvm/bindings/ocaml/bitreader/Makefile b/llvm/bindings/ocaml/bitreader/Makefile
diff --git a/llvm/bindings/ocaml/bitwriter/Makefile b/llvm/bindings/ocaml/bitwriter/Makefile
diff --git a/llvm/bindings/ocaml/executionengine/Makefile b/llvm/bindings/ocaml/executionengine/Makefile
diff --git a/llvm/bindings/ocaml/irreader/Makefile b/llvm/bindings/ocaml/irreader/Makefile
diff --git a/llvm/bindings/ocaml/linker/Makefile b/llvm/bindings/ocaml/linker/Makefile
diff --git a/llvm/bindings/ocaml/llvm/Makefile b/llvm/bindings/ocaml/llvm/Makefile
diff --git a/llvm/bindings/ocaml/target/Makefile b/llvm/bindings/ocaml/target/Makefile
diff --git a/llvm/bindings/ocaml/transforms/Makefile b/llvm/bindings/ocaml/transforms/Makefile
diff --git a/llvm/bindings/ocaml/transforms/ipo/Makefile b/llvm/bindings/ocaml/transforms/ipo/Makefile
diff --git a/llvm/bindings/ocaml/transforms/passmgr_builder/Makefile b/llvm/bindings/ocaml/transforms/passmgr_builder/Makefile
diff --git a/llvm/bindings/ocaml/transforms/scalar_opts/Makefile b/llvm/bindings/ocaml/transforms/scalar_opts/Makefile
diff --git a/llvm/bindings/ocaml/transforms/utils/Makefile b/llvm/bindings/ocaml/transforms/utils/Makefile
diff --git a/llvm/bindings/ocaml/transforms/vectorize/Makefile b/llvm/bindings/ocaml/transforms/vectorize/Makefile
diff --git a/llvm/cmake/Makefile b/llvm/cmake/Makefile
diff --git a/llvm/autoconf/config.guess → llvm/cmake/config.guess b/llvm/autoconf/config.guess → llvm/cmake/config.guess
diff --git a/llvm/cmake/modules/GetHostTriple.cmake b/llvm/cmake/modules/GetHostTriple.cmake
@@ -15,7 +15,7 @@ function( get_host_triple var )
       set( value "i686-pc-mingw32" )
     endif()
   else( MSVC )
-    set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess)
+    set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess)
     execute_process(COMMAND sh ${config_guess}
       RESULT_VARIABLE TT_RV
       OUTPUT_VARIABLE TT_OUT

diff --git a/llvm/cmake/modules/Makefile b/llvm/cmake/modules/Makefile
diff --git a/llvm/configure b/llvm/configure
diff --git a/llvm/docs/Makefile b/llvm/docs/Makefile
diff --git a/llvm/docs/Makefile.sphinx b/llvm/docs/Makefile.sphinx
diff --git a/llvm/docs/MakefileGuide.rst b/llvm/docs/MakefileGuide.rst
diff --git a/llvm/examples/BrainF/Makefile b/llvm/examples/BrainF/Makefile
diff --git a/llvm/examples/ExceptionDemo/Makefile b/llvm/examples/ExceptionDemo/Makefile
diff --git a/llvm/examples/Fibonacci/Makefile b/llvm/examples/Fibonacci/Makefile
diff --git a/llvm/examples/HowToUseJIT/Makefile b/llvm/examples/HowToUseJIT/Makefile
diff --git a/llvm/examples/Kaleidoscope/Chapter2/Makefile b/llvm/examples/Kaleidoscope/Chapter2/Makefile
diff --git a/llvm/examples/Kaleidoscope/Chapter3/Makefile b/llvm/examples/Kaleidoscope/Chapter3/Makefile
diff --git a/llvm/examples/Kaleidoscope/Chapter4/Makefile b/llvm/examples/Kaleidoscope/Chapter4/Makefile
diff --git a/llvm/examples/Kaleidoscope/Chapter5/Makefile b/llvm/examples/Kaleidoscope/Chapter5/Makefile
diff --git a/llvm/examples/Kaleidoscope/Chapter6/Makefile b/llvm/examples/Kaleidoscope/Chapter6/Makefile
diff --git a/llvm/examples/Kaleidoscope/Chapter7/Makefile b/llvm/examples/Kaleidoscope/Chapter7/Makefile
diff --git a/llvm/examples/Kaleidoscope/Chapter8/Makefile b/llvm/examples/Kaleidoscope/Chapter8/Makefile
diff --git a/llvm/examples/Kaleidoscope/MCJIT/cached/Makefile b/llvm/examples/Kaleidoscope/MCJIT/cached/Makefile
diff --git a/llvm/examples/Kaleidoscope/MCJIT/complete/Makefile b/llvm/examples/Kaleidoscope/MCJIT/complete/Makefile
diff --git a/llvm/examples/Kaleidoscope/MCJIT/initial/Makefile b/llvm/examples/Kaleidoscope/MCJIT/initial/Makefile
diff --git a/llvm/examples/Kaleidoscope/MCJIT/lazy/Makefile b/llvm/examples/Kaleidoscope/MCJIT/lazy/Makefile
diff --git a/llvm/examples/Kaleidoscope/Makefile b/llvm/examples/Kaleidoscope/Makefile
diff --git a/llvm/examples/Kaleidoscope/Orc/fully_lazy/Makefile b/llvm/examples/Kaleidoscope/Orc/fully_lazy/Makefile
diff --git a/llvm/examples/Kaleidoscope/Orc/initial/Makefile b/llvm/examples/Kaleidoscope/Orc/initial/Makefile
diff --git a/llvm/examples/Kaleidoscope/Orc/lazy_codegen/Makefile b/llvm/examples/Kaleidoscope/Orc/lazy_codegen/Makefile
diff --git a/llvm/examples/Kaleidoscope/Orc/lazy_irgen/Makefile b/llvm/examples/Kaleidoscope/Orc/lazy_irgen/Makefile
diff --git a/llvm/examples/Makefile b/llvm/examples/Makefile
diff --git a/llvm/examples/ModuleMaker/Makefile b/llvm/examples/ModuleMaker/Makefile
diff --git a/llvm/examples/OCaml-Kaleidoscope/Chapter2/Makefile b/llvm/examples/OCaml-Kaleidoscope/Chapter2/Makefile
diff --git a/llvm/examples/OCaml-Kaleidoscope/Chapter3/Makefile b/llvm/examples/OCaml-Kaleidoscope/Chapter3/Makefile
diff --git a/llvm/examples/OCaml-Kaleidoscope/Chapter4/Makefile b/llvm/examples/OCaml-Kaleidoscope/Chapter4/Makefile
diff --git a/llvm/examples/OCaml-Kaleidoscope/Chapter5/Makefile b/llvm/examples/OCaml-Kaleidoscope/Chapter5/Makefile
diff --git a/llvm/examples/OCaml-Kaleidoscope/Chapter6/Makefile b/llvm/examples/OCaml-Kaleidoscope/Chapter6/Makefile
diff --git a/llvm/examples/OCaml-Kaleidoscope/Chapter7/Makefile b/llvm/examples/OCaml-Kaleidoscope/Chapter7/Makefile
diff --git a/llvm/examples/OCaml-Kaleidoscope/Makefile b/llvm/examples/OCaml-Kaleidoscope/Makefile
diff --git a/llvm/examples/ParallelJIT/Makefile b/llvm/examples/ParallelJIT/Makefile