diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-19 16:09:28 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-19 16:09:28 +0000 |
| commit | 22d130ff523806129121f13fa8fb0b0dbf1cef89 (patch) | |
| tree | 40cdd81090ce0ad220865a75ca21f2aa57a292a1 /main/asterisk.c | |
| parent | a079f2ff9cef5e871ce613704e3817bf917c4015 (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123871 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 60c49070c..367044858 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -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) |