diff --git a/llvm/test/tools/llvm-ml/basic.test b/llvm/test/tools/llvm-ml/basic.test
--- a/llvm/test/tools/llvm-ml/basic.test
+++ b/llvm/test/tools/llvm-ml/basic.test
@@ -1,3 +1,4 @@
-# RUN: not llvm-ml %t.blah.asm /Fo /dev/null 2>&1 | FileCheck -DMSG=%errc_ENOENT --check-prefix=ENOENT %s
+# RUN: not llvm-ml %t.blah.asm /nologo /Fo /dev/null 2>&1 | FileCheck -DMSG=%errc_ENOENT --check-prefix=ENOENT %s
 
+# ENOENT-NOT: warning: ignoring unsupported 'nologo' option
 # ENOENT: {{.*}}.blah.asm: [[MSG]]
diff --git a/llvm/tools/llvm-ml/Opts.td b/llvm/tools/llvm-ml/Opts.td
--- a/llvm/tools/llvm-ml/Opts.td
+++ b/llvm/tools/llvm-ml/Opts.td
@@ -65,6 +65,9 @@
 def define : MLJoinedOrSeparate<"D">, MetaVarName<"<macro>=<value>">,
              HelpText<"Define <macro> to <value> (or blank if <value> "
                       "omitted)">;
+def no_logo : MLFlag<"nologo">,
+              HelpText<"No effect as this tool never writes copyright data. "
+                       "Included for parity">;
 def output_file : MLJoinedOrSeparate<"Fo">, HelpText<"Names the output file">;
 def include_path : MLJoinedOrSeparate<"I">,
                    HelpText<"Sets path for include files">;
@@ -101,7 +104,6 @@
 def c_conventions : UnsupportedFlag<"Gd">, HelpText<"">;
 def stdcall_conventions : UnsupportedFlag<"GZ">, HelpText<"">;
 def extern_name_limit : UnsupportedSeparate<"H">, HelpText<"">;
-def nologo : UnsupportedFlag<"nologo">, HelpText<"">;
 def omf_object_file : UnsupportedFlag<"omf">, HelpText<"">;
 def full_listing : UnsupportedFlag<"Sa">, HelpText<"">;
 def first_pass_listing : UnsupportedFlag<"Sf">, HelpText<"">;