Merge branch 'egil/remove-halfword/OTP-12883'

* egil/remove-halfword/OTP-12883: (21 commits)
  erts: Remove halfword etp-commands
  erts: Remove halfword MemKind mseg
  erts: Remove halfword bases in ETS
  erts: Remove halfword CHECK_POINTER_MASK
  erts: Remove halfword relative printf
  erts: Remove halfword valgrind suppress file
  erts: Remove halfword specific tests
  erts: Remove halfword specific allocator types
  erts: Remove halfword BINARY RELs
  erts: Remove halfword is_same bases macro
  erts: Reinstate copy_object over-allocation optimization
  erts: Remove halfword copy_object_rel
  erts: Remove halfword object manipulation
  erts: Remove halfword heap relative comparisions
  erts: Remove halfword pointer compression
  erts: Remove halfword basic relative heap operations
  erts: Remove halfword from configure
  erts: Remove halfword in lib_src
  erts: Remove halfword in erl_nif.h
  erts: Remove halfword in erl_driver.h
  ...

1 files changed, 10 insertions, 13 deletions

diff --git a/lib/ssh/test/ssh_upgrade_SUITE.erl b/lib/ssh/test/ssh_upgrade_SUITE.erl
index c0645f3b01..eca8b3663d 100644
--- a/lib/ssh/test/ssh_upgrade_SUITE.erl
+++ b/lib/ssh/test/ssh_upgrade_SUITE.erl
@@ -46,20 +46,17 @@ all() ->
 
 init_per_suite(Config0) ->
     catch crypto:stop(),
-    try {crypto:start(), erlang:system_info({wordsize, internal}) == 
-                 	     erlang:system_info({wordsize, external})} of
-	{ok, true} ->
-	    case ct_release_test:init(Config0) of
-		{skip, Reason} ->
-		    {skip, Reason};
-		Config ->
-		    ssh:start(),
-		    Config
-	    end;
-	{ok, false} ->
-	    {skip, "Test server will not handle halfwordemulator correctly. Skip as halfwordemulator is deprecated"} 
+    try crypto:start() of
+        ok ->
+            case ct_release_test:init(Config0) of
+                {skip, Reason} ->
+                    {skip, Reason};
+                Config ->
+                    ssh:start(),
+                    Config
+            end
     catch _:_ ->
-	    {skip, "Crypto did not start"}
+              {skip, "Crypto did not start"}
     end.
 
 end_per_suite(Config) ->