From: drh <> Date: Mon, 8 Jun 2026 18:15:27 +0000 (+0000) Subject: Fix builds on i486 CPUs. [forum:/info/2025-01-25T12:58:44Z|Forum 2025-01-25T12:58... X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6a1efec20af494283d3cc1ac64e2ac602111c1d3;p=thirdparty%2Fsqlite.git Fix builds on i486 CPUs. [forum:/info/2025-01-25T12:58:44Z|Forum 2025-01-25T12:58:44Z]. FossilOrigin-Name: 4cb349370daab17123770c814c71872a3e4c616a3f984569b3d7f97f9c3f5ea0 --- diff --git a/manifest b/manifest index d5bdf6b7f1..8a4f1d6623 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sanother\sbuffer\soverread\sin\sfts5\swhen\sprocessing\scorrupt\srecords.\sBug\s[bugs:/info/2026-06-08T16:03:39Z\s|\s2026-06-08T16:03:39Z\s]. -D 2026-06-08T17:48:00.893 +C Fix\sbuilds\son\si486\sCPUs.\s\s[forum:/info/2025-01-25T12:58:44Z|Forum\s2025-01-25T12:58:44Z]. +D 2026-06-08T18:15:27.790 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -695,7 +695,7 @@ F src/func.c 2fc6a53626184593eacb78a2bbf22b779da126f5ee17fb31c93245a95b89fa3d F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b F src/hash.c 03c8c0f4be9e8bcb6de65aa26d34a61d48a9430747084a69f9469fbb00ea52ca F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf -F src/hwtime.h 21c2cf1f736e7b97502c3674d0c386db3f06870d6f10d0cf8174e2a4b8cb726e +F src/hwtime.h 5cb15147c8583d0fc4748e1c12ea6f38c9deaeefa147a4d8d379fd9bc81fee9a F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c 8dbc22f6ddcc5f0af3abf11daeb89b1978f00059cda15ebc61251fa7724fc7ee F src/json.c f058c449acb9fdb1d3d1bb9f7e97b225ba773f5b6fdcec4310d3f49980125ed4 @@ -2208,8 +2208,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P b07441cfc06b8e6b47a4f4a6e0f5c261da580d5afe82444cc7f42a9f39ea7026 -R ae40b33df8767139bac4a0187d0a7023 -U dan -Z c79d2e80df95438b162b3ae9e2d68e50 +P 8ba5acabf9a0273ffbc2ba0bacc7f0b000690db91081858e4e563d6cbeeb4e7a +R d1fc1be8e784f6c0da33ac3ae03f9ce5 +U drh +Z d19c6e837904f1722c6702fe78a9f454 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 52ffd2ce6a..1343db07de 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8ba5acabf9a0273ffbc2ba0bacc7f0b000690db91081858e4e563d6cbeeb4e7a +4cb349370daab17123770c814c71872a3e4c616a3f984569b3d7f97f9c3f5ea0 diff --git a/src/hwtime.h b/src/hwtime.h index cf637edaf4..9607c3a69e 100644 --- a/src/hwtime.h +++ b/src/hwtime.h @@ -28,7 +28,7 @@ } #elif !defined(__STRICT_ANSI__) && defined(__GNUC__) && \ - (defined(i386) || defined(__i386__) || defined(_M_IX86)) + (defined(i586) || defined(__i586__) || defined(_M_IX86)) __inline__ sqlite_uint64 sqlite3Hwtime(void){ unsigned int lo, hi;