[Vm-dev] [commit][2929] add empty but important clause to ioHighResClock to allow ARM to compile these files .

commits at squeakvm.org commits at squeakvm.org
Thu May 22 04:14:05 UTC 2014


Revision: 2929
Author:   rowledge
Date:     2014-05-21 21:14:03 -0700 (Wed, 21 May 2014)
Log Message:
-----------
add empty but important clause to ioHighResClock to allow ARM to compile these files. Still need a meaningful implementation

Modified Paths:
--------------
    branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c
    branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c

Modified: branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c	2014-05-21 19:18:13 UTC (rev 2928)
+++ branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c	2014-05-22 04:14:03 UTC (rev 2929)
@@ -162,6 +162,8 @@
 			|| defined(i486) || defined(__i486) || defined (__i486__) \
 			|| defined(intel) || defined(x86) || defined(i86pc) )
     __asm__ __volatile__ ("rdtsc" : "=A"(value));
+#elif defined(__arm__) && defined(__ARM_ARCH_6__)
+	/* tpr - do nothing for now; needs input from eliot to decide further */
 #else
 # error "no high res clock defined"
 #endif

Modified: branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c	2014-05-21 19:18:13 UTC (rev 2928)
+++ branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c	2014-05-22 04:14:03 UTC (rev 2929)
@@ -157,6 +157,8 @@
 			|| defined(i486) || defined(__i486) || defined (__i486__) \
 			|| defined(intel) || defined(x86) || defined(i86pc) )
     __asm__ __volatile__ ("rdtsc" : "=A"(value));
+#elif defined(__arm__) && defined(__ARM_ARCH_6__)
+	/* tpr - do nothing for now; needs input from eliot to decide further */
 #else
 # error "no high res clock defined"
 #endif



More information about the Vm-dev mailing list