Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -745,6 +745,25 @@
                ),
          'category': 'clang'},
 
+        {'name' : "clang-solaris11-amd64",
+         'slavenames' : ["solaris11-amd64"],
+         'builddir' : "clang-solaris11-amd64",
+         'factory': ClangBuilder.getClangCMakeBuildFactory(
+		       clean=False,
+		       checkout_lld=False,
+                       extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
+					 '-DLLVM_TARGETS_TO_BUILD=X86',
+                                         '-DCLANG_DEFAULT_LINKER=/usr/bin/ld'])},
+
+        {'name' : "clang-solaris11-sparcv9",
+         'slavenames' : ["solaris11-sparcv9"],
+         'builddir' : "clang-solaris11-sparcv9",
+         'factory': ClangBuilder.getClangCMakeBuildFactory(
+		       clean=False,
+		       checkout_lld=False,
+                       extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
+					 '-DLLVM_TARGETS_TO_BUILD=Sparc',
+                                         '-DCLANG_DEFAULT_LINKER=/usr/bin/ld'])},
     ]
 
 # Polly builders.
Index: zorg/trunk/buildbot/osuosl/master/config/slaves.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py
@@ -218,4 +218,8 @@
         # Ubuntu 18.04.2 LTS x86_64 Intel(R) Xeon(R) Gold CPU @ 2.1GHz, 128GB RAM
         create_slave("as-builder-4", properties={'jobs': 64}, max_builds=1),
 
+        # Solaris 11
+        create_slave("solaris11-amd64", properties={'jobs' : 8}, max_builds=1),
+        create_slave("solaris11-sparcv9", properties={'jobs' : 8}, max_builds=1),
+
         ]