From: drh <>
Date: Mon, 24 Apr 2023 19:14:56 +0000 (+0000)
Subject: Update the compile-time detection of architecture byte-order in the RTREE
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Frtree-bulk-insert-perf;p=thirdparty%2Fsqlite.git

Update the compile-time detection of architecture byte-order in the RTREE
extension so that it is aligned with the latest enhancements in the core.

FossilOrigin-Name: 491bd51da5e2069078d7295396d80d2ccdc3a5871714fef948076939174e6acd
---

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 38d09d2497..da5e2a97a8 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -471,16 +471,17 @@ struct RtreeMatchArg {
 ** at run-time.
 */
 #ifndef SQLITE_BYTEORDER
-#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__)
-# define SQLITE_BYTEORDER    1234
-#elif defined(sparc)    || defined(__ppc__)
-# define SQLITE_BYTEORDER    4321
-#else
-# define SQLITE_BYTEORDER    0     /* 0 means "unknown at compile-time" */
-#endif
+# 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(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
+#   define SQLITE_BYTEORDER    1234
+# elif defined(sparc)     || defined(__ppc__) || \
+       defined(__ARMEB__) || defined(__AARCH64EB__)
+#   define SQLITE_BYTEORDER    4321
+# else
+#   define SQLITE_BYTEORDER 0
+# endif
 #endif
 
 
diff --git a/manifest b/manifest
index e9ab5721d4..bcb2122aa9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Import\sfixes\sfrom\strunk\sinto\sthe\sbranch-3.41.
-D 2023-04-22T23:43:42.815
+C Update\sthe\scompile-time\sdetection\sof\sarchitecture\sbyte-order\sin\sthe\sRTREE\nextension\sso\sthat\sit\sis\saligned\swith\sthe\slatest\senhancements\sin\sthe\score.
+D 2023-04-24T19:14:56.355
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -392,7 +392,7 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/geopoly.c 971e0b5bd9adaf0811feb8c0842a310811159da10319eb0e74fdb42bf26b99ca
-F ext/rtree/rtree.c e05929e78d127613a9eea5dc372c77a049484892d8e9fac1fe0cce85ce4fba81
+F ext/rtree/rtree.c 925888f7672b326fc2a29b3a212ec3ae4aa2331507ecccfaf7f0ac0335020330
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test d47f58832145fcfed9067bc457ca8664962196c4566c17a1ebd679367db55d11
 F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@ -2046,19 +2046,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d37241585cf23b14695611a733fff4940db4c0501836e845dad17d2df0c8c22b
-Q +1489e7f53a4863b316af6dee10d9c66491d1bed6cf52a3538ac118c03b1d7ef9
-Q +33681ff3d29c9f096dbd8c5d885993f780e93974a7653adc00fa41a158356d7c
-Q +3ac1984039a50445ff65db97468a5313d7f09db7b604755e444b77ac9346ea76
-Q +4d5af42c651bc1655a4f09b743f2a1424f19c1e4248e041b3fd4a042fd1f9799
-Q +5157fd1cf753b1c01c6c00e9ac2712da2631a673837ed15ec3420ec869ee66aa
-Q +53a61f7423a7f057568a1d8a1e63be01a2328997850dc32e3d8c6d51f1c5ab0b
-Q +81a74ee9d66ba23dfadd875e372ce96491dd6bf146e03e7fec8c3fd98e6be825
-Q +cd485b302c54aef066d751a153df34eea0cd23e54a414e291f636ad9929fe78a
-Q +da907dbc60b4f754845ae0bedc05cbda4cbfed9f468be3ffdc18860c763d9324
-Q +f097ca70b5b967d1aadebd74ac5020813e00b7c30cc543814dbf5f359d1328f1
-Q +f35ce7c122017009496b777f33e641d0be086abee6ea8e25aab4c3e0fb45731a
-R c48bf397275c9157b9ae1f61b37aab31
+P 58a1d94c59b8f16db2ceae79b4f3a70439edbdea20daac8fdefc85a51345a8b7
+R d8ac18fffeaea8c85cf38d478e558957
+T *branch * rtree-bulk-insert-perf
+T *sym-rtree-bulk-insert-perf *
+T -sym-branch-3.41 *
 U drh
-Z a18196b3c3e2bc170571f43625dc6d5a
+Z d06b521247707e016ae8081afa937309
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 53ee9fc881..77dd5e9e0d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-58a1d94c59b8f16db2ceae79b4f3a70439edbdea20daac8fdefc85a51345a8b7
\ No newline at end of file
+491bd51da5e2069078d7295396d80d2ccdc3a5871714fef948076939174e6acd
\ No newline at end of file