Revert "Batch merge"

This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.

4 files changed, 2 insertions, 45 deletions

diff --git a/docs/users_guide/8.8.1-notes.rst b/docs/users_guide/8.8.1-notes.rst
index 33b7f48e43..cd4c00d1a4 100644
--- a/docs/users_guide/8.8.1-notes.rst
+++ b/docs/users_guide/8.8.1-notes.rst
@@ -111,10 +111,6 @@ Runtime system
   Generation of these files, which sport a ``.hie`` suffix, is enabled via the
   ``-fwrite-ide-info`` flag. See :ref:`hie-options` for more information.
 
-- A new flag ``-xp`` is added on x86_64. When it is passed, the runtime linker
-  can load object files compiled with ``-fPIC -fexternal-dynamic-refs``
-  anywhere in the address space. This used to be restricted to the low 2Gb.
-
 Template Haskell
 ~~~~~~~~~~~~~~~~
 
diff --git a/docs/users_guide/runtime_control.rst b/docs/users_guide/runtime_control.rst
index 0048a51837..a5c2f1474f 100644
--- a/docs/users_guide/runtime_control.rst
+++ b/docs/users_guide/runtime_control.rst
@@ -241,28 +241,6 @@ Miscellaneous RTS options
     crashes if exception handling are enabled. In order to get more information
     in compiled executables, C code or DLLs symbols need to be available.
 
-
-.. rts-flag:: -xp
-
-    On 64-bit machines, the runtime linker usually needs to map object code
-    into the low 2Gb of the address space, due to the x86_64 small memory model
-    where most symbol references are 32 bits. The problem is that this 2Gb of
-    address space can fill up, especially if you're loading a very large number
-    of object files into GHCi.
-
-    This flag offers a workaround, albeit a slightly convoluted one. To be able
-    to load an object file outside of the low 2Gb, the object code needs to be
-    compiled with ``-fPIC -fexternal-dynamic-refs``. When the ``+RTS -xp`` flag
-    is passed, the linker will assume that all object files were compiled with
-    ``-fPIC -fexternal-dynamic-refs`` and load them anywhere in the address
-    space. It's up to you to arrange that the object files you load (including
-    all packages) were compiled in the right way. If this is not the case for
-    an object, the linker will probably fail with an error message when the
-    problem is detected.
-
-    On some platforms where PIC is always the case, e.g. x86_64 MacOS X, this
-    flag is enabled by default.
-
 .. rts-flag:: -xm ⟨address⟩
 
     .. index::
@@ -272,10 +250,8 @@ Miscellaneous RTS options
 
         This option is for working around memory allocation
         problems only. Do not use unless GHCi fails with a message like
-        “\ ``failed to mmap() memory below 2Gb``\ ”. Consider recompiling
-        the objects with ``-fPIC -fexternal-dynamic-refs`` and using the
-        ``-xp`` flag instead. If you need to use this option to get GHCi
-        working on your machine, please file a bug.
+        “\ ``failed to mmap() memory below 2Gb``\ ”. If you need to use this
+        option to get GHCi working on your machine, please file a bug.
 
     On 64-bit machines, the RTS needs to allocate memory in the low 2Gb
     of the address space. Support for this across different operating
diff --git a/docs/users_guide/separate_compilation.rst b/docs/users_guide/separate_compilation.rst
index 8c997f0942..338c438eea 100644
--- a/docs/users_guide/separate_compilation.rst
+++ b/docs/users_guide/separate_compilation.rst
@@ -588,11 +588,6 @@ The GHC API exposes functions for reading and writing these files.
     that are being written out. These include testing things properties such as
     variables not occuring outside of their expected scopes.
 
-The format in which GHC currently stores its typechecked AST, makes it costly
-to collect the types for some expressions nodes. For the sake of performance,
-GHC currently chooses to skip over these, so not all expression nodes should be
-expected to have type information on them. See :ghc-ticket:`16233` for more.
-
 .. _recomp:
 
 The recompilation checker
diff --git a/docs/users_guide/using.rst b/docs/users_guide/using.rst
index 83eeb51eed..420e2d3bfc 100644
--- a/docs/users_guide/using.rst
+++ b/docs/users_guide/using.rst
@@ -1088,16 +1088,6 @@ Some flags only make sense for particular target platforms.
     SSE4.2 if your processor supports it but detects this automatically
     so no flag is required.
 
-.. ghc-flag:: -mbmi2
-    :shortdesc: (x86 only) Use BMI2 for bit manipulation operations
-    :type: dynamic
-    :category: platform-options
-
-    (x86 only, added in GHC 7.4.1) Use the BMI2 instruction set to
-    implement some bit operations when using the
-    :ref:`native code generator <native-code-gen>`. The resulting compiled
-    code will only run on processors that support BMI2 (Intel Haswell and newer, AMD Excavator, Zen and newer).
-
 Miscellaneous flags
 -------------------