From 284ae601c3c157eaf683adeec154bdae46cdfe01 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 19 Jun 2008 16:08:29 +0000
Subject: [PATCH] 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/trunk@123870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/asterisk.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/asterisk.c b/main/asterisk.c
index a5a111cf37..fde3be6a38 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -577,7 +577,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)
-- 
GitLab