Fixes for 32-bit

2 files changed, 10 insertions, 2 deletions

diff --git a/asmrun/spacetime_offline.c b/asmrun/spacetime_offline.c
index 9453e0da47..0c47417b5a 100644
--- a/asmrun/spacetime_offline.c
+++ b/asmrun/spacetime_offline.c
@@ -38,6 +38,8 @@
 
 #include "../config/s.h"
 
+#ifdef ARCH_SIXTYFOUR
+
 /* CR-someday lwhite: The following two definitions are copied from spacetime.c
    because they are needed here, but must be inlined in spacetime.c
    for performance. Perhaps a macro or "static inline" would be
@@ -221,3 +223,5 @@ CAMLprim value caml_spacetime_c_node_allocation_count(value node)
   Assert(!Is_block(c_node->data.allocation.count));
   return c_node->data.allocation.count;
 }
+
+#endif
diff --git a/configure b/configure
index 9f4d813cdf..715e3adac3 100755
--- a/configure
+++ b/configure
@@ -1121,10 +1121,14 @@ echo "GRAPHLIB=$graphlib" >> Makefile
 
 otherlibraries="$unixlib str num dynlink bigarray"
 
-# Spacetime profiling is only available for native code.
+# Spacetime profiling is only available for native code on 64-bit targets.
 
 case "$native_compiler" in
-    true) otherlibraries="$otherlibraries raw_spacetime_lib" ;;
+    true)
+      if $arch64; then
+        otherlibraries="$otherlibraries raw_spacetime_lib"
+      fi
+      ;;
     *) ;;
 esac