blob: f7f5606b37b7620e5756e555972c5c1c1402ba15 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
Index: linden/indra/llcommon/llfasttimer.cpp
===================================================================
--- linden/indra/llcommon/llfasttimer.cpp (revision 40)
+++ linden/indra/llcommon/llfasttimer.cpp (revision 41)
@@ -90,21 +90,14 @@
#endif // LL_WINDOWS
-#if LL_LINUX
+#if LL_LINUX && (defined(__i386__) || defined(__amd64__))
U64 get_cpu_clock_count()
{
U64 x;
__asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
return x;
}
-#endif
-
-#if LL_DARWIN
-//
-// Mac implementation of CPU clock
-//
-// Just use gettimeofday implementation for now
-
+#else
U64 get_cpu_clock_count()
{
return get_clock_count();
|
GitWeb
