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, 2 insertions, 2 deletions

diff --git a/erts/emulator/beam/erl_bif_re.c b/erts/emulator/beam/erl_bif_re.c
index 86951f32b0..7f7cd376ac 100644
--- a/erts/emulator/beam/erl_bif_re.c
+++ b/erts/emulator/beam/erl_bif_re.c
@@ -100,7 +100,7 @@ Sint erts_re_set_loop_limit(Sint limit)
 
 static int term_to_int(Eterm term, int *sp)
 {
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 
     if (is_small(term)) {
 	Uint x = signed_val(term);
@@ -151,7 +151,7 @@ static int term_to_int(Eterm term, int *sp)
 
 static Eterm make_signed_integer(int x, Process *p)
 {
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
     return make_small(x);
 #else
     Eterm* hp;