From 13fe0b762ac1334f8063da12988adedd67c03dba Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 30 Apr 2023 11:03:36 +0200
Subject: [PATCH] squash! x64

---
 kaem.arm    |  1 +
 kaem.run    |  3 ++-
 kaem.x86    |  1 +
 kaem.x86_64 |  1 +
 src/posix.c | 11 ++++++-----
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/kaem.arm b/kaem.arm
index 4e973a1f..4357c62b 100644
--- a/kaem.arm
+++ b/kaem.arm
@@ -19,6 +19,7 @@
 # Usage:
 # kaem --verbose --strict
 
+cc_cpu=arm
 mes_cpu=arm
 stage0_cpu=armv7l
 kaem --verbose --strict
diff --git a/kaem.run b/kaem.run
index ee4de280..cdbae3aa 100644
--- a/kaem.run
+++ b/kaem.run
@@ -19,6 +19,7 @@
 # Usage:
 # kaem --verbose --strict
 
+cc_cpu=${mes_cpu:-i386}
 mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
@@ -27,7 +28,7 @@ mkdir -p m2
 M2-Planet                                       \
     --debug                                     \
     --architecture ${stage0_cpu}                \
-    -D __${mes_cpu}__=1                         \
+    -D __${cc_cpu}__=1                          \
     -D __linux__=1                              \
     -f include/mes/config.h                     \
     -f include/mes/lib-mini.h                   \
diff --git a/kaem.x86 b/kaem.x86
index 60ab6e6b..caea7f87 100644
--- a/kaem.x86
+++ b/kaem.x86
@@ -19,6 +19,7 @@
 # Usage:
 # kaem --verbose --strict
 
+cc_cpu=i386
 mes_cpu=x86
 stage0_cpu=x86
 kaem --verbose --strict
diff --git a/kaem.x86_64 b/kaem.x86_64
index e6329ba8..b20aecc3 100644
--- a/kaem.x86_64
+++ b/kaem.x86_64
@@ -19,6 +19,7 @@
 # Usage:
 # kaem --verbose --strict
 
+cc_cpu=x86_64
 mes_cpu=x86_64
 stage0_cpu=amd64
 kaem --verbose --strict
diff --git a/src/posix.c b/src/posix.c
index 75201ca9..b619ac14 100644
--- a/src/posix.c
+++ b/src/posix.c
@@ -373,15 +373,16 @@ waitpid_ (struct scm *pid, struct scm *options)
   return cons (make_number (child), make_number (status));
 }
 
-#if __M2__
-/* Milliseconds for everyone else.  */
-#define TIME_UNITS_PER_SECOND 1000
-#elif __x86_64__
+#if __x86_64__
 /* Nanoseconds on 64-bit systems with POSIX timers.  */
+#if __M2__
+#define TIME_UNITS_PER_SECOND 1000000000
+#else
 #define TIME_UNITS_PER_SECOND 1000000000U
+#endif
 #else
 /* Milliseconds for everyone else.  */
-#define TIME_UNITS_PER_SECOND 1000U
+#define TIME_UNITS_PER_SECOND 1000
 #endif
 
 struct scm *