squash! x64

kaem.arm

@@ -19,6 +19,7 @@
 # Usage:
 # kaem --verbose --strict
 
+cc_cpu=arm
 mes_cpu=arm
 stage0_cpu=armv7l
 kaem --verbose --strict

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                   \

kaem.x86

@@ -19,6 +19,7 @@
 # Usage:
 # kaem --verbose --strict
 
+cc_cpu=i386
 mes_cpu=x86
 stage0_cpu=x86
 kaem --verbose --strict

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

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 *