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
@@ -88,6 +88,23 @@
                           "-DLLVM_TARGETS_TO_BUILD:STRING=AVR;X86",
                           "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:STRING=AVR",
                           "-DBUILD_SHARED_LIBS=ON",
+                        ])},
+        {'name': "llvm-riscv-linux",
+         'slavenames':["riscv-build-01"],
+         'builddir':"llvm-riscv-linux",
+         'factory': LLVMBuilder.getLLVMCMakeBuildFactory(
+                        timeout=40, config_name='Release',
+                        enable_shared=True,
+                        extra_cmake_args=[
+                          "-G", "Ninja",
+                          "-DCMAKE_BUILD_TYPE:STRING=Release",
+                          # We need to compile the X86 backend due to a few generic CodeGen tests.
+                          "-DLLVM_TARGETS_TO_BUILD:STRING=RISCV;X86",
+                          "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:STRING=RISCV",
+                          "-DBUILD_SHARED_LIBS=ON",
+                          "-DCMAKE_C_COMPILER='clang'",
+                          "-DCMAKE_CXX_COMPILER='clang++'",
+                          "-DLLVM_ENABLE_LLD=True",
                         ])}
         ]
 
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
@@ -105,6 +105,9 @@
         # Ubuntu x86-64
         create_slave("avr-build-01", properties={'jobs': 10}, max_builds=1),
 
+        # Arch Linux x86-64
+        create_slave("riscv-build-01", properties={'jobs': 8}, max_builds=1),
+
         # Cavium Octeon II V0.8, MIPS64r2 big endian, Debian Jessie
         create_slave("mipsswbrd002", properties={'jobs' : 6}, max_builds=1),
 
Index: zorg/trunk/buildbot/osuosl/master/config/status.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py
+++ zorg/trunk/buildbot/osuosl/master/config/status.py
@@ -228,4 +228,13 @@
                         "lldb-amd64-ninja-netbsd8"],
             addLogs=False,
             num_lines = 15),
+        InformativeMailNotifier(
+            fromaddr = "llvm.buildmaster@lab.llvm.org",
+            sendToInterestedUsers = False,
+            extraRecipients = ["asb@lowrisc.org"],
+            subject="Build %(builder)s Failure",
+            mode = "failing",
+            builders = ["llvm-riscv-linux"],
+            addLogs=False,
+            num_lines = 15),
         ]