Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -2390,4 +2390,52 @@
                     ],
                     )},
 
+    ## CSKY check-all + test-suite in soft-float
+    {'name' : "clang-csky-soft",
+    'tags'  : ["clang"],
+    'collapseRequests': False,
+    'workernames' : ["thead-clang-csky"],
+    'builddir':"clang-csky-softfp",
+    'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                clean=False,
+                runTestSuite=True,
+                testsuite_flags=[
+                    '--cflags', '-mcpu=c860 -latomic -DSMALL_PROBLEM_SIZE',
+                    '--cppflags', '-mcpu=c860 -latomic -DSMALL_PROBLEM_SIZE',
+                    '--run-under=/mnt/qemu/bin/qemu-cskyv2 -cpu c860 -csky-extend denormal=on -L /mnt/gcc-csky/csky-linux-gnuabiv2/libc/ck860 -E LD_LIBRARY_PATH=/mnt/gcc-csky/csky-linux-gnuabiv2/lib/ck860',
+                    '--cmake-define=SMALL_PROBLEM_SIZE=On',
+                    '--cmake-define=TEST_SUITE_USER_MODE_EMULATION=True',
+                    '--threads=32', '--build-threads=32'],
+                extra_cmake_args=[
+                    "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='CSKY'",
+                    "-DLLVM_DEFAULT_TARGET_TRIPLE='csky-unknown-linux'"
+                    "-DGCC_INSTALL_PREFIX=/mnt/gcc-csky/"],
+                env={
+                    'PATH':'/mnt/mysandbox/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin',
+                    })},
+
+    ## CSKY check-all + test-suite in hard-float
+    {'name' : "clang-csky-hardfp",
+    'tags'  : ["clang"],
+    'collapseRequests': False,
+    'workernames' : ["thead-clang-csky"],
+    'builddir':"clang-csky-hardfp",
+    'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                clean=False,
+                runTestSuite=True,
+                testsuite_flags=[
+                    '--cflags', '-mcpu=c860 -latomic -mhard-float -DSMALL_PROBLEM_SIZE',
+                    '--cppflags', '-mcpu=c860 -latomic -mhard-float -DSMALL_PROBLEM_SIZE',
+                    '--run-under=/mnt/qemu/bin/qemu-cskyv2 -cpu c860 -csky-extend denormal=on -L /mnt/gcc-csky/csky-linux-gnuabiv2/libc/ck860/hard-fp -E LD_LIBRARY_PATH=/mnt/gcc-csky/csky-linux-gnuabiv2/lib/ck860/hard-fp',
+                    '--cmake-define=SMALL_PROBLEM_SIZE=On',
+                    '--cmake-define=TEST_SUITE_USER_MODE_EMULATION=True',
+                    '--threads=32', '--build-threads=32'],
+                extra_cmake_args=[
+                    "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='CSKY'",
+                    "-DLLVM_DEFAULT_TARGET_TRIPLE='csky-unknown-linux'"
+                    "-DGCC_INSTALL_PREFIX=/mnt/gcc-csky/"],
+                env={
+                    'PATH':'/mnt/mysandbox/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin',
+                    })},
+
 ]
Index: buildbot/osuosl/master/config/workers.py
===================================================================
--- buildbot/osuosl/master/config/workers.py
+++ buildbot/osuosl/master/config/workers.py
@@ -53,7 +53,7 @@
         create_worker("linaro-flang-aarch64-rel-assert", properties={'jobs' : 32}, max_builds=1),
         create_worker("linaro-flang-aarch64-latest-gcc", properties={'jobs' : 32}, max_builds=1),
 
-        # AArch64 Windows Microsoft Surface X Pro 
+        # AArch64 Windows Microsoft Surface X Pro
         create_worker("linaro-armv8-windows-msvc-01", properties={'jobs' : 8}, max_builds=1),
         create_worker("linaro-armv8-windows-msvc-02", properties={'jobs' : 8}, max_builds=1),
         create_worker("linaro-lldb-aarch64-windows", properties={'jobs' : 8}, max_builds=1),
@@ -163,7 +163,7 @@
 
         # Windows x86_64 32 CPUs, 125 GB RAM
         create_worker("libc-x86_64-windows", properties={'jobs': 32}, max_builds=2),
-        
+
         # Ubuntu aarch64 128 CPUs, 125 GB RAM
         create_worker("libc-aarch64-ubuntu", properties={'jobs': 32}, max_builds=2),
 
@@ -294,4 +294,7 @@
 
         # Fedora worker
         create_worker("standalone-build-x86_64", properties={'jobs': 32}, max_builds=1),
+
+        # CSKY T-HEAD workers
+        create_worker("thead-clang-csky", properties={'jobs' : 32}, max_builds=1),
         ]