Index: llvm/tools/llvm-gsymutil/Opts.td
===================================================================
--- llvm/tools/llvm-gsymutil/Opts.td
+++ llvm/tools/llvm-gsymutil/Opts.td
@@ -34,7 +34,7 @@
 defm address : Eq<"address", "Lookup an address in a GSYM file">;
 def addresses_from_stdin :
   FF<"addresses-from-stdin",
-     "Emit a section containing remark diagnostics metadata. By default, this is enabled for the following formats: yaml-strtab, bitstream">;
+     "Lookup addresses in a GSYM file that are read from stdin\nEach input line is expected to be of the following format: <addr> <gsym-path>">;
 defm symtab_file :
   Eq<"symtab-file",
      "Specify a separate file for symbol table to GSYM conversion.\nIn case the symbol table and debug info are not in the same binary. Does not support universal binary.">;
Index: llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
===================================================================
--- llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
+++ llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
@@ -174,7 +174,7 @@
   for (const llvm::opt::Arg *A : Args.filtered(OPT_address_EQ)) {
     StringRef S{A->getValue()};
     if (!llvm::to_integer(S, LookupAddresses.emplace_back(), 0)) {
-      llvm::errs() << ToolName << ": for the --segment-size option: '" << S
+      llvm::errs() << ToolName << ": for the --address option: '" << S
                    << "' value invalid for uint argument!\n";
       std::exit(1);
     }