From e1e119bf12095e7161004a52d33d5c1bc956f65a Mon Sep 17 00:00:00 2001
From: Douglas Yung <douglas.yung@sony.com>
Date: Sat, 12 Oct 2024 01:29:10 -0400
Subject: [PATCH 1/2] Add clone of llvm-clang-x86_64-gcc-ubuntu builder that
 builds without assertions.

---
 buildbot/osuosl/master/config/builders.py | 18 ++++++++++++++++++
 buildbot/osuosl/master/config/workers.py  |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index 2f1180f4..7a2c8537 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1013,6 +1013,24 @@
                         "-DLLVM_LIT_ARGS=--verbose",
                         "-DLLVM_TARGETS_TO_BUILD=AArch64"])},
 
+    {'name': "llvm-clang-x86_64-gcc-ubuntu-no-asserts",
+    'tags'  : ["llvm", "clang", "clang-tools-extra", "compiler-rt", "lld", "cross-project-tests"],
+    'workernames': ["doug-worker-6"],
+    'builddir': "gcc-no-asserts",
+    'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
+                    depends_on_projects=['llvm','clang','clang-tools-extra','compiler-rt','lld','cross-project-tests'],
+                    extra_configure_args=[
+                        "-DCMAKE_C_COMPILER=gcc",
+                        "-DCMAKE_CXX_COMPILER=g++",
+                        "-DCMAKE_BUILD_TYPE=Release",
+                        "-DCLANG_ENABLE_CLANGD=OFF",
+                        "-DLLVM_BUILD_RUNTIME=ON",
+                        "-DLLVM_BUILD_TESTS=ON",
+                        "-DLLVM_ENABLE_ASSERTIONS=OFF",
+                        "-DLLVM_INCLUDE_EXAMPLES=OFF",
+                        "-DLLVM_LIT_ARGS=--verbose",
+                        "-DLLVM_USE_LINKER=gold"])},
+
 # Polly builders.
 
     {'name' : "polly-arm-linux",
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
index b44690ea..4f3b6e6a 100644
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -331,6 +331,9 @@ def get_all():
         create_worker("doug-worker-4", properties={'jobs': 8}, max_builds=1),
         create_worker("doug-worker-5", properties={'jobs': 8}, max_builds=1),
 
+        # Ubuntu 20.04, AMD Ryzen 5 PRO 3400GE, 32GB
+        create_worker("doug-worker-6", properties={'jobs': 8}, max_builds=1),
+
         # XCore target, Ubuntu 20.04 x64 host
         create_worker("xcore-ubuntu20-x64", properties={'jobs': 4}, max_builds=1),
 

From bbbdd7a0e06cae12b9fde80458d88fa8c43a98de Mon Sep 17 00:00:00 2001
From: Douglas Yung <douglas.yung@sony.com>
Date: Sun, 13 Oct 2024 22:17:44 -0400
Subject: [PATCH 2/2] Switch to using LLD for linker.

---
 buildbot/osuosl/master/config/builders.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index 7a2c8537..ff9ae5bc 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1029,7 +1029,7 @@
                         "-DLLVM_ENABLE_ASSERTIONS=OFF",
                         "-DLLVM_INCLUDE_EXAMPLES=OFF",
                         "-DLLVM_LIT_ARGS=--verbose",
-                        "-DLLVM_USE_LINKER=gold"])},
+                        "-DLLVM_USE_LINKER=lld"])},
 
 # Polly builders.