Remove stale code for hybrid heap and incremental GC

The hybrid heap emulator was last working in the non-SMP R11B
run-time system. When the constant pools were introduced in R12B,
the hybrid heap emulator was not updated to handle them.

At this point, the harm from reduced readability of the code is
greater than any potential usefulness of keeping the code.

3 files changed, 2 insertions, 35 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 72cbf1f3b2..f8a92e1ec4 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -442,11 +442,7 @@
 	  system with SMP support is available. <c>-smp auto</c> starts
 	  the Erlang runtime system with SMP support enabled if it is
 	  available and more than one logical processor are detected.
-	  <c>-smp disable</c> starts a runtime system without SMP support.
-	  By default <c>-smp auto</c> will be used unless a conflicting
-	  parameter has been passed, then <c>-smp disable</c> will be
-	  used. Currently only the <c>-hybrid</c> parameter conflicts
-	  with <c>-smp auto</c>.</p>
+	  <c>-smp disable</c> starts a runtime system without SMP support.</p>
         <p><em>NOTE</em>: The runtime system with SMP support will not
           be available on all supported platforms. See also the
           <seealso marker="#+S">+S</seealso> flag.</p>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index cfc7fff3af..e4f245975b 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -4009,14 +4009,6 @@ os_prompt% </pre>
             <p><c>Size</c> is the size in bytes of the process. This
               includes call stack, heap and internal structures.</p>
           </item>
-          <tag><c>{message_binary, BinInfo}</c></tag>
-          <item>
-            <p><c>BinInfo</c> is a list containing miscellaneous information
-	      about binaries currently being referred to by the message
-	      area. This <c>InfoTuple</c> is only valid on an emulator
-	      using the hybrid heap type. This <c>InfoTuple</c> may be
-	      changed or removed without prior notice.</p>
-          </item>
           <tag><c>{message_queue_len, MessageQueueLen}</c></tag>
           <item>
             <p><c>MessageQueueLen</c> is the number of messages
@@ -5803,10 +5795,6 @@ ok
               can spawn a process that does not use the default
               settings.</p>
           </item>
-          <tag><c>global_heaps_size</c></tag>
-          <item>
-            <p>Returns the current size of the shared (global) heap.</p>
-          </item>
           <tag><c>heap_sizes</c></tag>
           <item>
             <p>Returns a list of integers representing valid heap sizes 
@@ -5816,7 +5804,7 @@ ok
           <tag><c>heap_type</c></tag>
           <item>
             <p>Returns the heap type used by the current emulator.
-              Currently the following heap types exist:</p>
+              Currently only the following heap type exists:</p>
             <taglist>
               <tag><c>private</c></tag>
               <item>
@@ -5825,17 +5813,6 @@ ok
                   allowed. Messages passed between processes are copied
                   between heaps.</p>
               </item>
-              <tag><c>shared</c></tag>
-              <item>
-                <p>One heap for use by all processes. Messages passed
-                  between processes are passed by reference.</p>
-              </item>
-              <tag><c>hybrid</c></tag>
-              <item>
-                <p>A hybrid of the <c>private</c> and <c>shared</c> heap
-                  types. A shared heap as well as private heaps are
-                  used.</p>
-              </item>
             </taglist>
           </item>
           <tag><c>info</c></tag>
diff --git a/erts/doc/src/erlc.xml b/erts/doc/src/erlc.xml
index ebf76a2afe..3358b8f115 100644
--- a/erts/doc/src/erlc.xml
+++ b/erts/doc/src/erlc.xml
@@ -129,12 +129,6 @@
           This option will be ignored by compilers that have a
           a single output format.</p>
       </item>
-      <tag>-hybrid</tag>
-      <item>
-        <p>Compile using the hybrid-heap emulator. This is mainly useful
-          for compiling native code, which needs to be compiled with the same
-          run-time system that it should be run on.</p>
-      </item>
       <tag>-smp</tag>
       <item>
         <p>Compile using the SMP emulator. This is mainly useful