Vendor import of lld release_80 branch r354799:vendor/lld/lld-release_800-r356365vendor/lld/lld-release_80-r356034vendor/lld/lld-release_80-r355677vendor/lld/lld-release_80-r355313vendor/lld/lld-release_80-r354799

https://llvm.org/svn/llvm-project/lld/branches/release_80@354799

2 files changed, 2 insertions, 7 deletions

diff --git a/ELF/Options.td b/ELF/Options.td
index bc203193661b..439fe341644c 100644
--- a/ELF/Options.td
+++ b/ELF/Options.td
@@ -30,7 +30,7 @@ def Bstatic: F<"Bstatic">, HelpText<"Do not link against shared libraries">;
 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)",
diff --git a/docs/ReleaseNotes.rst b/docs/ReleaseNotes.rst
index 0bebfb3fb1ce..aab52573d925 100644
--- a/docs/ReleaseNotes.rst
+++ b/docs/ReleaseNotes.rst
@@ -5,11 +5,6 @@ lld 8.0.0 Release Notes
 .. contents::
     :local:
 
-.. warning::
-   These are in-progress notes for the upcoming LLVM 8.0.0 release.
-   Release notes for previous releases can be found on
-   `the Download Page <https://releases.llvm.org/download.html>`_.
-
 Introduction
 ============
 
@@ -18,7 +13,7 @@ Mach-O (macOS), MinGW and WebAssembly. lld is command-line-compatible with
 GNU linkers and Microsoft link.exe and is significantly faster than the
 system default linkers.
 
-nlld 8.0.0 has lots of feature improvements and bug fixes.
+lld 8.0.0 has lots of feature improvements and bug fixes.
 
 Non-comprehensive list of changes in this release
 =================================================