diff --git a/.clangd b/.clangd
new file mode 100644
index 000000000000..f6fab1b26e60
--- /dev/null
+++ b/.clangd
@@ -0,0 +1,7 @@
+# Part of the Carbon Language project, under the Apache License v2.0 with LLVM
+# Exceptions. See /LICENSE for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+CompileFlags:
+  # Workaround for https://github.com/clangd/clangd/issues/1582
+  Remove: [-march=*]