diff --git a/llvm/test/tools/llvm-symbolizer/use-symbol-table.s b/llvm/test/tools/llvm-symbolizer/use-symbol-table.s
new file mode 100644
index 000000000000..aed7d43d3391
--- /dev/null
+++ b/llvm/test/tools/llvm-symbolizer/use-symbol-table.s
@@ -0,0 +1,7 @@
+# REQUIRES: x86-registered-target
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64 -g %s -o %t.o
+
+## --use-symbol-table=true is used by old asan_symbolize.py and Android ndk
+## ndk-stack.py. Keep it as a no-op compatibility option for a while.
+# RUN: llvm-symbolizer --use-symbol-table=true %t.o
diff --git a/llvm/tools/llvm-symbolizer/Opts.td b/llvm/tools/llvm-symbolizer/Opts.td
index ea28d98cbe27..e8def4ff9a6a 100644
--- a/llvm/tools/llvm-symbolizer/Opts.td
+++ b/llvm/tools/llvm-symbolizer/Opts.td
@@ -67,3 +67,5 @@ def : Flag<["--"], "inlining=false">, Alias<no_inlines>, HelpText<"Alias for --n
 // Compatibility aliases for pprof's symbolizer.
 def : Flag<["-"], "demangle=true">, Alias<demangle>, HelpText<"Alias for --demangle">;
 def : Flag<["-"], "demangle=false">, Alias<no_demangle>, HelpText<"Alias for --no-demangle">;
+// Compatibility no-op options.
+def : Flag<["--"], "use-symbol-table=true">;