Update

Author: gnzlbg

src/items/external-blocks.md

@@ -31,7 +31,7 @@
 
 External blocks provide _declarations_ of items that are not _defined_ in the
 current crate and are the basis of Rust's foreign function interface. Using
-items declared in external blocks is `unsafe`.
+items declared in external blocks is only allowed in an `unsafe` context.
 
 Two kind of item _declarations_ are allowed in external blocks:
 [functions] and [statics].
@@ -90,6 +90,16 @@ There are also some platform-specific ABI strings:
 * `extern "vectorcall"` -- The `vectorcall` ABI -- corresponds to MSVC's
   `__vectorcall` and clang's `__attribute__((vectorcall))`
 
+<<<<<<< HEAD
+=======
+Finally, there are some unstable `rustc`-specific ABI strings:
+
+* `extern "rust-intrinsic"` -- The ABI of rustc intrinsics, equivalent to `"Rust"`.
+* `extern "rust-call"` -- The ABI of the Fn::call trait functions, equivalent to `"Rust"`.
+* `extern "platform-intrinsic"` -- The ABI of Specific platform intrinsics, equivalent to `"Rust"` -- like, for
+  example, `sqrt` -- equivalent to `"Rust"`. You should never have to deal with it.
+
+>>>>>>> 5764e1240c4d5ae73539baebce860b846c23db2c
 ## Variadic functions
 
 Functions within external blocks may be variadic by specifying `...` after one

src/items/functions.md

@@ -172,7 +172,7 @@ Functions with an ABI that differs from `"Rust"` do not support unwinding in the
 exact same way that Rust does. Therefore, unwinding past the end of functions
 with such ABIs causes the process to abort.
 
-**Non-normative note**: The LLVM backend of the current Rust implementation
+> **Note**: The LLVM backend of the `rustc` implementation
 aborts the process by executing an illegal instruction.
 
 ## Const functions