diff --git a/WORKSPACE b/WORKSPACE
index 922f3eaaa..4ac27bdf4 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -26,9 +26,9 @@ http_archive(
     ],
 )
 
-LLVM_COMMIT = "ff5e2babcb46e7eb3887ee265decb2948da2792c"
+LLVM_COMMIT = "2a1f1b5fde0a2e03f94fa2cb5c7765d405fda0de"
 
-LLVM_SHA256 = "31682f931855f1061ef6082622adcfffe5aeda98596cbf9f1d8574e924b6f78e"
+LLVM_SHA256 = "52a4b342a71c94966c291cc78376b8027727eed214955122c26b45c2482a958e"
 
 http_archive(
     name = "llvm-raw",
diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt
index 622fb51b9..7de3ee94e 100644
--- a/build_tools/llvm_version.txt
+++ b/build_tools/llvm_version.txt
@@ -1,2 +1,2 @@
-ff5e2babcb46e7eb3887ee265decb2948da2792c
+2a1f1b5fde0a2e03f94fa2cb5c7765d405fda0de
 
diff --git a/stablehlo/build_tools/llvm_version.txt b/stablehlo/build_tools/llvm_version.txt
index fe53f8e12..1888115be 100644
--- a/stablehlo/build_tools/llvm_version.txt
+++ b/stablehlo/build_tools/llvm_version.txt
@@ -1 +1 @@
-ff5e2babcb46e7eb3887ee265decb2948da2792c
+2a1f1b5fde0a2e03f94fa2cb5c7765d405fda0de
diff --git a/transforms/test_hlo_transform_dialect_interpreter.cc b/transforms/test_hlo_transform_dialect_interpreter.cc
index e5b653963..69a752985 100644
--- a/transforms/test_hlo_transform_dialect_interpreter.cc
+++ b/transforms/test_hlo_transform_dialect_interpreter.cc
@@ -142,7 +142,7 @@ class TestHloTransformDialectInterpreterPass
     if (failed(transform::detail::interpreterBaseRunOnOperationImpl(
             getOperation(), getArgument(), getSharedTransformModule(),
             getTransformLibraryModule(), extraMapping, options,
-            transformFileName, transformLibraryFileName, debugPayloadRootTag,
+            transformFileName, transformLibraryPaths, debugPayloadRootTag,
             debugTransformRootTag, getBinaryName())))
       return signalPassFailure();
   }
@@ -184,8 +184,8 @@ class TestHloTransformDialectInterpreterPass
           "Optional filename containing a transform dialect specification to "
           "apply. If left empty, the IR is assumed to contain one top-level "
           "transform dialect operation somewhere in the module.")};
-  Option<std::string> transformLibraryFileName{
-      *this, "transform-library-file-name", llvm::cl::init(""),
+  ListOption<std::string> transformLibraryPaths{
+      *this, "transform-library-paths", llvm::cl::ZeroOrMore,
       llvm::cl::desc(
           "Optional name of the file containing transform dialect symbol "
           "definitions to be injected into the transform module.")};