Guard the x64 assembler in wal.c with "ifdef __x86_64__".

FossilOrigin-Name: 5fa1699e31856a6585cc59183641c4cc99e1ccd99c384d13e9c4442e9c07f41a

diff --git a/manifest b/manifest
index 05a138f7681649ccb1ac6d5f18d87d450211308f..abeac6c0921b9cbcdbbe1f06a09942bbb59b411d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\slogging\sto\sreport\son\soccasions\swhen\sloading\sthe\sANALYZE\sdata\sis\sslow.
-D 2024-12-05T19:45:14.902
+C Guard\sthe\sx64\sassembler\sin\swal.c\swith\s"ifdef\s__x86_64__".
+D 2024-12-06T09:36:28.866
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -857,7 +857,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8
 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
 F src/vtab.c 5fb499d20494b7eecaadb7584634af9afcb374cb0524912b475fcb1712458a1b
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 83decd78a90b841e1dde30326308f9afa3342efac8bd4da0011c39b3a18d4ff1
+F src/wal.c 704794b1e89dd6c1bef36086253f94ffd2abb16f71f23d5240d811d96c27bb99
 F src/wal.h 8c59ee7a835574396d7cbd04626d11fd849613e361a46e7e9519091ab03bdb29
 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
 F src/where.c c046dd58c3410f7b7528e1e6317cb876398557bad346d568ed8562321a7d002d
@@ -2250,8 +2250,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c10fa6af8bd8d64a6e528f3e71999d1631e66a8dd483a83c1fc30d65ccaf0f6d
-R 38d4c9663d5d633a71927a367474b8f2
+P 5f9f6764e9dffef60213bbc9604940ddfc713436333c3f62ed8a090697fcbb1e
+R dc2d528d700a9f31a595b645f35f63e8
 U dan
-Z d13ab7db2792449f91cb2091035c82e1
+Z 3df61137fb8f8d436afd0a2fa28a051e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 064a14802d20d69f58553d017f924bcaaea5fd31..d80c58f788168bf544666b5909e75eab5e4ef3db 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f9f6764e9dffef60213bbc9604940ddfc713436333c3f62ed8a090697fcbb1e
+5fa1699e31856a6585cc59183641c4cc99e1ccd99c384d13e9c4442e9c07f41a

diff --git a/src/wal.c b/src/wal.c
index 751d0864f730693835b30f4eab3b2f066661eed2..9af30beb66f93b993213783562c2124ec042f500 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -1636,6 +1636,7 @@ static void walCleanupHash(Wal *pWal){
 ** 8, and p must be aligned to an 8-byte boundary.
 */
 static void zero64(void *p, int n){
+#if defined(__x86_64__)
   size_t c = n / sizeof(u64);
   void *d = p;
 
@@ -1648,6 +1649,9 @@ static void zero64(void *p, int n){
         : "a" (0)
         : "memory"
   );
+#else
+  memset(p, 0, n);
+#endif
 }
 
 /*