Importing rustc-1.36.0

Bug: 140573584
Change-Id: Ic7c29cdfd302b3301b4f3541f46524916c0c5012
diff --git a/src/test/ui/issues/issue-20313.stderr b/src/test/ui/issues/issue-20313.stderr
index 87e2e89..405e717 100644
--- a/src/test/ui/issues/issue-20313.stderr
+++ b/src/test/ui/issues/issue-20313.stderr
@@ -1,9 +1,10 @@
-error[E0658]: linking to LLVM intrinsics is experimental (see issue #29602)
+error[E0658]: linking to LLVM intrinsics is experimental
   --> $DIR/issue-20313.rs:3:5
    |
 LL |     fn sqrt(x: f32) -> f32;
    |     ^^^^^^^^^^^^^^^^^^^^^^^
    |
+   = note: for more information, see https://github.com/rust-lang/rust/issues/29602
    = help: add #![feature(link_llvm_intrinsics)] to the crate attributes to enable
 
 error: aborting due to previous error