From: shane <shane@noemail.net>
Date: Fri, 1 Aug 2008 14:33:15 +0000 (+0000)
Subject: Applied patch to fix failure with build on gcc-powerpc (provide sqlite3Hwtime). Ticke... 
X-Git-Tag: version-3.6.10~661
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5cd89cfe718337eda6b8bf61fa9cd414e8fb010f;p=thirdparty%2Fsqlite.git

Applied patch to fix failure with build on gcc-powerpc (provide sqlite3Hwtime). Ticket #3256. (CVS 5516)

FossilOrigin-Name: c9ecd88e273aee56b4af5b69fae94e1f98d3e43d
---

diff --git a/manifest b/manifest
index dbc54d6ba6..1ef211f673 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sxAccess()\sfails\swhile\sattempting\sto\sdetect\sa\shot-journal\sfile,\sdo\snot\sassume\sthat\sthe\serror\swas\san\sout-of-memory\scondition.\s(CVS\s5515)
-D 2008-08-01T10:50:23
+C Applied\spatch\sto\sfix\sfailure\swith\sbuild\son\sgcc-powerpc\s(provide\ssqlite3Hwtime).\sTicket\s#3256.\s(CVS\s5516)
+D 2008-08-01T14:33:15
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -110,7 +110,7 @@ F src/func.c 54efe220cc1ef3859a4b738011621b63a0d697c5
 F src/global.c b9c96ee2317a6e1391763c7db1098a6473a91863
 F src/hash.c eb64e48f3781100e5934f759fbe72a63a8fe78cb
 F src/hash.h 031cd9f915aff27e12262cb9eb570ac1b8326b53
-F src/hwtime.h 745961687a65ef8918cd551c02e5ccb4b8e772de
+F src/hwtime.h 4a1d45f4cae1f402ea19686acf24acf4f0cb53cb
 F src/insert.c 89cd9af52a5ea6fb7d0cfc9c3b935d6406c360c4
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c 3635cc6a5889918086b3501de8287cbbecb55917
@@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P bc5abd31a7b5bc656edbb54c1c4523549d888056
-R fcbe4ad8b3e67d6472323658421c446a
-U danielk1977
-Z aceab1fca2abe9cb8b7e81fe04cfe121
+P 70f20425e8197bce74b412f65050d954acb5bde4
+R 2d38dc146256265ec77d91cb755f3e60
+U shane
+Z 4375de578167b9cc339e50ddb4efab2f
diff --git a/manifest.uuid b/manifest.uuid
index 11b15fba26..eee93d0484 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-70f20425e8197bce74b412f65050d954acb5bde4
\ No newline at end of file
+c9ecd88e273aee56b4af5b69fae94e1f98d3e43d
\ No newline at end of file
diff --git a/src/hwtime.h b/src/hwtime.h
index 40d7da75f9..896041ee7b 100644
--- a/src/hwtime.h
+++ b/src/hwtime.h
@@ -13,7 +13,7 @@
 ** This file contains inline asm code for retrieving "high-performance"
 ** counters for x86 class CPUs.
 **
-** $Id: hwtime.h,v 1.2 2008/06/12 02:24:39 shane Exp $
+** $Id: hwtime.h,v 1.3 2008/08/01 14:33:15 shane Exp $
 */
 #ifndef _HWTIME_H_
 #define _HWTIME_H_
@@ -54,6 +54,21 @@
       return val;
   }
  
+#elif (defined(__GNUC__) && defined(__ppc__))
+
+  __inline__ sqlite_uint64 sqlite3Hwtime(void){
+      unsigned long long retval;
+      unsigned long junk;
+      __asm__ __volatile__ ("\n\
+          1:      mftbu   %1\n\
+                  mftb    %L0\n\
+                  mftbu   %0\n\
+                  cmpw    %0,%1\n\
+                  bne     1b"
+                  : "=r" (retval), "=r" (junk));
+      return retval;
+  }
+
 #else
 
   #error Need implementation of sqlite3Hwtime() for your platform.