[asterisk-commits] tilghman: branch 1.6.0 r123871 - in /branches/1.6.0: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Jun 19 11:09:28 2008
New Revision: 123871

URL: http://svn.digium.com/view/asterisk?view=rev&rev=123871
Log:
Merged revisions 123870 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r123870 | tilghman | 2008-06-19 11:08:29 -0500 (Thu, 19 Jun 2008) | 14 lines

Merged revisions 123869 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r123869 | tilghman | 2008-06-19 11:07:23 -0500 (Thu, 19 Jun 2008) | 6 lines

The RDTSC instruction was introduced on the Pentium line of microprocessors,
and is not compatible with certain 586 clones, like Cyrix.  Hence, asking for
i386 compatibility was always incorrect. See http://en.wikipedia.org/wiki/RDTSC
(Closes issue #12886)
Reported by tecnoxarxa

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/asterisk.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=123871&r1=123870&r2=123871
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Thu Jun 19 11:09:28 2008
@@ -569,7 +569,10 @@
 	return prof_data->e[i].value;
 }
 
-#if defined ( __i386__) && (defined(__FreeBSD__) || defined(linux))
+/* The RDTSC instruction was introduced on the Pentium processor and is not
+ * implemented on certain clones, like the Cyrix 586. Hence, the previous
+ * expectation of __i386__ was in error. */
+#if defined ( __i686__) && (defined(__FreeBSD__) || defined(linux))
 #if defined(__FreeBSD__)
 #include <machine/cpufunc.h>
 #elif defined(linux)