[lld] r354440 - Merging r354422:

[Hans Wennborg via llvm-commits]

Author: hans
Date: Wed Feb 20 00:21:37 2019
New Revision: 354440

URL: http://llvm.org/viewvc/llvm-project?rev=354440&view=rev
Log:
Merging r354422:
------------------------------------------------------------------------
r354422 | tstellar | 2019-02-20 02:40:35 +0100 (Wed, 20 Feb 2019) | 11 lines

ELF: Fix typo in --build-id option description

Reviewers: ruiu, espindola

Reviewed By: ruiu

Subscribers: emaste, arichardson, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D58265
------------------------------------------------------------------------

Modified:
    lld/branches/release_80/   (props changed)
    lld/branches/release_80/ELF/Options.td

Propchange: lld/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 20 00:21:37 2019
@@ -1 +1 @@
-/lld/trunk:351326,351335,351898-351899,352068,352082,352257,352302,352407,352413,352435,352459,352482,352606,352928-352929,353250,353399,353968
+/lld/trunk:351326,351335,351898-351899,352068,352082,352257,352302,352407,352413,352435,352459,352482,352606,352928-352929,353250,353399,353968,354422

Modified: lld/branches/release_80/ELF/Options.td
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/ELF/Options.td?rev=354440&r1=354439&r2=354440&view=diff
==============================================================================
--- lld/branches/release_80/ELF/Options.td (original)
+++ lld/branches/release_80/ELF/Options.td Wed Feb 20 00:21:37 2019
@@ -30,7 +30,7 @@ def Bstatic: F<"Bstatic">, HelpText<"Do
 def build_id: F<"build-id">, HelpText<"Alias for --build-id=fast">;
 
 def build_id_eq: J<"build-id=">, HelpText<"Generate build ID note">,
-  MetaVarName<"[fast,md5,sha,uuid,0x<hexstring>]">;
+  MetaVarName<"[fast,md5,sha1,uuid,0x<hexstring>]">;
 
 defm check_sections: B<"check-sections",
     "Check section addresses for overlaps (default)",