Fix to [9d3a12d3926d55ef] to force the static const string literal to

have two-byte alignment.  Necessary to get that patch to work in Mac-ARM.

FossilOrigin-Name: a80c847169f307a4d2e524b6732ea557bf7f312f1a319d6c6c2e81adb0907596

diff --git a/manifest b/manifest
index a4253c97de5420a66c0e58d329f9205744eea0af..b6b573f2ecac13ce4a21bd51ded980fd0d41be9d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s"LLU"\ssuffix\sto\s64-bit\sinteger\sconstants,\sfor\sportability\sto\solder\ncompilers.
-D 2026-02-14T21:47:08.084
+C Fix\sto\s[9d3a12d3926d55ef]\sto\sforce\sthe\sstatic\sconst\sstring\sliteral\sto\nhave\stwo-byte\salignment.\s\sNecessary\sto\sget\sthat\spatch\sto\swork\sin\sMac-ARM.
+D 2026-02-14T22:04:53.811
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -803,7 +803,7 @@ F src/trigger.c cb894db98083c68c4a17c72566ed39434aa91286db20d2891279ee49e6bfec0c
 F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf
 F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
 F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
-F src/util.c d7cd5a4c9859c260b17d3e2d821306a265f6a4d0962941a1d187b4ccaf74c455
+F src/util.c 2b95816e47e3e789c3a803a8591678c082c24e78146175e9c1b9039c61869ec0
 F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82
 F src/vdbe.c fa28a8f740f3d94c4e6b6d42ba90c220472683486268e753017512a70ef715f5
 F src/vdbe.h 966d0677a540b7ea6549b7c4e1312fc0d830fce3a235a58c801f2cc31cf5ecf9
@@ -2194,8 +2194,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 9c3d09ee75beb26447161c0bf5ea252520a6ec051774f1a4e9f18204281d504f
-R 81af0af5ea2a6b0d90ff8f5528e1d00d
+P 4bf08110662c4b8db9ee90ce34271890a62a469166ea292f7f782b84236531d4
+R e9a61f8d803b1efd3bc1e0ac0477000a
 U drh
-Z d1c5742bcc364eb12a36c71331cc2f0e
+Z 60f49f9dc3f68ee820a036cf7efdaecb
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 1f157b26f314ef216b21ca50b5347b135318748e..ad4d726634618087232678a320565283443b9df0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4bf08110662c4b8db9ee90ce34271890a62a469166ea292f7f782b84236531d4
+a80c847169f307a4d2e524b6732ea557bf7f312f1a319d6c6c2e81adb0907596

diff --git a/src/util.c b/src/util.c
index b0ab7dde3a60e2a04763da91bed52fddc567bbed..8ae247a32800d707bda3d19940d900ed64433a83 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1823,7 +1823,10 @@ void sqlite3FpDecode(FpDecode *p, double r, int iRound, int mxRound){
   i = sizeof(p->zBuf)-1;
   assert( v>0 );
   while( v>=10 ){
-    static const char dig[] = 
+    static const union {
+      char a[200];
+      short int forAlignment;
+    } dig = {
       "00010203040506070809"
       "10111213141516171819"
       "20212223242526272829"
@@ -1833,11 +1836,12 @@ void sqlite3FpDecode(FpDecode *p, double r, int iRound, int mxRound){
       "60616263646566676869"
       "70717273747576777879"
       "80818283848586878889"
-      "90919293949596979899";
+      "90919293949596979899"
+    };
     int kk = (v%100)*2;
-    assert( TWO_BYTE_ALIGNMENT(&dig[kk]) );
+    assert( TWO_BYTE_ALIGNMENT(&dig.a[kk]) );
     assert( TWO_BYTE_ALIGNMENT(&p->zBuf[i-1]) );
-    *(u16*)(&p->zBuf[i-1]) = *(u16*)&dig[kk];
+    *(u16*)(&p->zBuf[i-1]) = *(u16*)&dig.a[kk];
     i -= 2;
     v /= 100;
   }