Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -389,6 +389,62 @@
                                            '--target=hexagon-unknown-elf',
                                            '--enable-targets=hexagon'])},
 
+        {'name': "clang-msvc-x86_64",
+         'slavenames': ["hexagon-build-01"],
+         'builddir': "builddir\\clang-msvc-x86_64",
+         'factory': ClangBuilder.getClangCMakeBuildFactory(
+                    jobs=None,
+                    loadaverage=None,
+                    cmakeGenerator="Visual Studio 12",
+                    cmakeProjectfile="ALL_BUILD.vcxproj",
+                    # MSBuild command with user arguments.
+                    build_cmd=["MSBuild","/p:Configuration=RelWithDebInfo",
+                    "/maxcpucount", "ALL_BUILD.vcxproj"],
+                    build_install_cmd=["MSBuild","/p:Configuration=RelWithDebInfo",
+                    "/maxcpucount", "INSTALL.vcxproj"],
+                    build_check_cmd=["MSBuild","/p:Configuration=RelWithDebInfo",
+                    "/maxcpucount", "check-clang.vcxproj"],
+                    build_check_dir='stage1/tools/clang/test',
+
+                    # Phase 2 build with built Clang.
+                    cmakeGenerator2='Ninja',     
+                    cmakeProjectfile2='build.ninja',
+                    build_cmd2=['ninja'],
+                    build_install_cmd2=['ninja', 'install'],
+                    build_check_cmd2=['ninja', 'check-all'],
+
+                    # Multi-stage compilation
+                    useTwoStage=False,
+                    testStage1=True,
+                    stage1_config='RelWithDebInfo',
+                    stage2_config='RelWithDebInfo', 
+                    slave_envCmd=r""""%VS120COMNTOOLS%\vsvars32.bat" %PROCESSOR_ARCHITECTURE% & set""",
+                    slave_envCmd2=r"""set""",
+                    extra_cmake_args=[
+                    '-DLLVM_BUILD_RUNTIME:BOOL=OFF',
+                    '-DLIBCLANG_BUILD_STATIC=ON',
+                    '-DLLVM_ENABLE_PIC:BOOL=ON',
+                    '-DLLVM_MINIMAL_INSTALL:BOOL=ON',
+                    '-DLLVM_ENABLE_ASSERTIONS:BOOL=ON',
+                    '-DLLVM_ENABLE_STATS:BOOL=ON',
+                    '-DLLVM_LIT_ARGS:=--verbose --no-progress-bar --param build_config=Win32',
+                    '-DCMAKE_BUILD_TYPE=RelWithDebInfo',
+                    '-DLLVM_APPEND_VC_REV:BOOL=ON',
+                    "-DLLVM_TARGETS_TO_BUILD='Hexagon'"                     ],
+                     )},
+        {'name': "clang-cmake-hexagon-linux",
+         'slavenames':["hexagon-build-02"],
+         'builddir':"clang-cmake-hexagon-linux",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                      jobs=32,
+                      loadaverage=32,
+                      clean=False,
+                      checkout_compiler_rt=False,
+                      useTwoStage=False,
+                      testStage1=True,
+                      env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
+                      extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='Hexagon'"])},
+
         {'name' : "clang-aarch64-lnt",
          'slavenames' :["aarch64-qemu-lnt"],
          'builddir' :"clang-aarch64-lnt",