kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 123870 via svnmerge from

Browse Source 
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

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-06-19 16:09:28 +00:00
parent 94291642d2
commit 9787f4b97d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/asterisk.c
View File

@@ -569,7 +569,10 @@ int64_t ast_profile(int i, int64_t delta)
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)