Rebase sqlite patch on chromium 073d7fe

shawnanastasio · Apr 28, 2019 · 25c811f · 25c811f
1 parent 21369cd
commit 25c811f
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/database/0001-Properly-detect-little-endian-PPC64-systems.patch b/database/0001-Properly-detect-little-endian-PPC64-systems.patch
@@ -10,10 +10,10 @@ Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/third_party/sqlite/amalgamation/sqlite3.c b/third_party/sqlite/amalgamation/sqlite3.c
-index 79faa1dd55..fc64b354eb 100644
+index 9261544a80..bb1b33ceb1 100644
 --- a/third_party/sqlite/amalgamation/sqlite3.c
 +++ b/third_party/sqlite/amalgamation/sqlite3.c
-@@ -13912,7 +13912,8 @@ typedef INT16_TYPE LogEst;
+@@ -13942,7 +13942,8 @@ typedef INT16_TYPE LogEst;
  # if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
       defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
       defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
@@ -23,10 +23,24 @@ index 79faa1dd55..fc64b354eb 100644
  #   define SQLITE_BYTEORDER    1234
  # elif defined(sparc)    || defined(__ppc__)
  #   define SQLITE_BYTEORDER    4321
-diff --git a/third_party/sqlite/src/src/sqliteInt.h b/third_party/sqlite/src/src/sqliteInt.h
-index 53ad684d7d..bb6fcbfc7a 100644
---- a/third_party/sqlite/src/src/sqliteInt.h
-+++ b/third_party/sqlite/src/src/sqliteInt.h
+diff --git a/third_party/sqlite/sqlite-src-3270200/src/sqliteInt.h b/third_party/sqlite/sqlite-src-3270200/src/sqliteInt.h
+index 4940511dc4..2dc8d0fccc 100644
+--- a/third_party/sqlite/sqlite-src-3270200/src/sqliteInt.h
++++ b/third_party/sqlite/sqlite-src-3270200/src/sqliteInt.h
+@@ -833,7 +833,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+      defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+      defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-     defined(__arm__)  || defined(_M_ARM64)
++     defined(__arm__)  || defined(_M_ARM64)   || defined(__powerpc64__) && \
++     (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)    || defined(__ppc__)
+ #   define SQLITE_BYTEORDER    4321
+diff --git a/third_party/sqlite/sqlite-src-3280000/src/sqliteInt.h b/third_party/sqlite/sqlite-src-3280000/src/sqliteInt.h
+index 72953e6009..7543a27fcc 100644
+--- a/third_party/sqlite/sqlite-src-3280000/src/sqliteInt.h
++++ b/third_party/sqlite/sqlite-src-3280000/src/sqliteInt.h
 @@ -833,7 +833,8 @@ typedef INT16_TYPE LogEst;
  # if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
       defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \