From 15e2ddeab3c81cbe20c43cdb9643a2e1ca62b874 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Fri, 27 May 2016 18:09:45 +0000 Subject: [PATCH 1/5] Add basic compiler information to the results of 'PRAGMA compile_options'. FossilOrigin-Name: d734e2df40d95da74ce0c8dd2da1c14033cad8bb --- manifest | 17 ++++++++++------- manifest.uuid | 2 +- src/ctime.c | 7 +++++++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 8c4974db29..970b987929 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improvements\sto\sWHERE-clause\sdebug\stracing.\s\sShow\sTK_MATCH\sexpressions\sand\nshow\smore\sdetails\son\sWhereTerm\straces. -D 2016-05-27T12:30:20.162 +C Add\sbasic\scompiler\sinformation\sto\sthe\sresults\sof\s'PRAGMA\scompile_options'. +D 2016-05-27T18:09:45.039 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7 @@ -329,7 +329,7 @@ F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/build.c 785fa789319d93c6ae20efbd01d4da9ce8f8a793 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198 +F src/ctime.c dc03a31584045e0d7ee62659416c557bc35c679e F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39 F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f @@ -1495,7 +1495,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P a9be4c2d56d08fea2cd1aab20b19092a45ef7620 -R 2beba98fee0a4944905820065cc75fbf -U drh -Z 8d7a3e9d02c8c2b09e27f05110ad65d3 +P 71087c12bc75a82f5d1051600a442ef6efc5e899 +R 5414a76b2e5839d41b19cee14a1187ef +T *branch * ctimeCompiler +T *sym-ctimeCompiler * +T -sym-trunk * +U mistachkin +Z 2c1781ffb1db3ba053f96360f37bbb14 diff --git a/manifest.uuid b/manifest.uuid index 2f2802b83d..bf8c366494 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -71087c12bc75a82f5d1051600a442ef6efc5e899 \ No newline at end of file +d734e2df40d95da74ce0c8dd2da1c14033cad8bb \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index f1bb69c16a..f91615f44a 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -45,6 +45,13 @@ static const char * const azCompileOpt[] = { #if SQLITE_CHECK_PAGES "CHECK_PAGES", #endif +#if defined(_MSC_VER) + "COMPILER=msvc-" CTIMEOPT_VAL(_MSC_VER), +#elif defined(__GNUC__) && defined(__VERSION__) + "COMPILER=gcc-" CTIMEOPT_VAL(__VERSION__), +#elif defined(__clang__) && defined(__clang_version__) + "COMPILER=clang-" CTIMEOPT_VAL(__clang_version__), +#endif #if SQLITE_COVERAGE_TEST "COVERAGE_TEST", #endif From 2b9672e998099c1c7fd96e8b0f621f61cd85cc31 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 27 May 2016 19:34:29 +0000 Subject: [PATCH 2/5] Remove surplus quotation marks from the COMPILER= compile_options setting for GCC. FossilOrigin-Name: 664c132dabe4a871d5c39c11b339f871ca3a5d31 --- manifest | 17 +++++++---------- manifest.uuid | 2 +- src/ctime.c | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 970b987929..6dcca4db34 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sbasic\scompiler\sinformation\sto\sthe\sresults\sof\s'PRAGMA\scompile_options'. -D 2016-05-27T18:09:45.039 +C Remove\ssurplus\squotation\smarks\sfrom\sthe\sCOMPILER=\scompile_options\ssetting\nfor\sGCC. +D 2016-05-27T19:34:29.738 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7 @@ -329,7 +329,7 @@ F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/build.c 785fa789319d93c6ae20efbd01d4da9ce8f8a793 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c dc03a31584045e0d7ee62659416c557bc35c679e +F src/ctime.c 7d735d9700670e61f415f0874cee3888515b94db F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39 F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f @@ -1495,10 +1495,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 71087c12bc75a82f5d1051600a442ef6efc5e899 -R 5414a76b2e5839d41b19cee14a1187ef -T *branch * ctimeCompiler -T *sym-ctimeCompiler * -T -sym-trunk * -U mistachkin -Z 2c1781ffb1db3ba053f96360f37bbb14 +P d734e2df40d95da74ce0c8dd2da1c14033cad8bb +R ee122ac8c0e3fee0c343c143c0eaf533 +U drh +Z 748a461f334251e4f63154f77f6b9c4a diff --git a/manifest.uuid b/manifest.uuid index bf8c366494..3464a2a6e1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d734e2df40d95da74ce0c8dd2da1c14033cad8bb \ No newline at end of file +664c132dabe4a871d5c39c11b339f871ca3a5d31 \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index f91615f44a..0fc1c4cd0c 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -48,7 +48,7 @@ static const char * const azCompileOpt[] = { #if defined(_MSC_VER) "COMPILER=msvc-" CTIMEOPT_VAL(_MSC_VER), #elif defined(__GNUC__) && defined(__VERSION__) - "COMPILER=gcc-" CTIMEOPT_VAL(__VERSION__), + "COMPILER=gcc-" __VERSION__, #elif defined(__clang__) && defined(__clang_version__) "COMPILER=clang-" CTIMEOPT_VAL(__clang_version__), #endif From 756e09c338a73c807506ce4b4c4e391cb5b69b1e Mon Sep 17 00:00:00 2001 From: mistachkin Date: Fri, 27 May 2016 20:30:02 +0000 Subject: [PATCH 3/5] Remove surplus quotation marks from the COMPILER= compile_options setting for Clang. FossilOrigin-Name: 5c966f200018043f5258eb03e043bb25c7766131 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/ctime.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 6dcca4db34..6b25a7bcf8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\ssurplus\squotation\smarks\sfrom\sthe\sCOMPILER=\scompile_options\ssetting\nfor\sGCC. -D 2016-05-27T19:34:29.738 +C Remove\ssurplus\squotation\smarks\sfrom\sthe\sCOMPILER=\scompile_options\ssetting\sfor\sClang. +D 2016-05-27T20:30:02.032 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7 @@ -329,7 +329,7 @@ F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/build.c 785fa789319d93c6ae20efbd01d4da9ce8f8a793 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c 7d735d9700670e61f415f0874cee3888515b94db +F src/ctime.c 5fffce9c220c2694bdefcc5297d77f14266370b8 F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39 F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f @@ -1495,7 +1495,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P d734e2df40d95da74ce0c8dd2da1c14033cad8bb -R ee122ac8c0e3fee0c343c143c0eaf533 -U drh -Z 748a461f334251e4f63154f77f6b9c4a +P 664c132dabe4a871d5c39c11b339f871ca3a5d31 +R c95d80b350856738e8dbac827a63287b +U mistachkin +Z 5ee041c65db3cfb46a182fca07281d4b diff --git a/manifest.uuid b/manifest.uuid index 3464a2a6e1..aeff037a85 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -664c132dabe4a871d5c39c11b339f871ca3a5d31 \ No newline at end of file +5c966f200018043f5258eb03e043bb25c7766131 \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index 0fc1c4cd0c..a39917af99 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -50,7 +50,7 @@ static const char * const azCompileOpt[] = { #elif defined(__GNUC__) && defined(__VERSION__) "COMPILER=gcc-" __VERSION__, #elif defined(__clang__) && defined(__clang_version__) - "COMPILER=clang-" CTIMEOPT_VAL(__clang_version__), + "COMPILER=clang-" __clang_version__, #endif #if SQLITE_COVERAGE_TEST "COVERAGE_TEST", From 7ce6cdd51511feeaa45b02451424f64bfabadd50 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Fri, 27 May 2016 21:13:43 +0000 Subject: [PATCH 4/5] Check for Clang before GCC. FossilOrigin-Name: 7c2cd4b05f88a759bdf72d3a249db5984fd7105d --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/ctime.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 6b25a7bcf8..43de9fbb03 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\ssurplus\squotation\smarks\sfrom\sthe\sCOMPILER=\scompile_options\ssetting\sfor\sClang. -D 2016-05-27T20:30:02.032 +C Check\sfor\sClang\sbefore\sGCC. +D 2016-05-27T21:13:43.995 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7 @@ -329,7 +329,7 @@ F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/build.c 785fa789319d93c6ae20efbd01d4da9ce8f8a793 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c 5fffce9c220c2694bdefcc5297d77f14266370b8 +F src/ctime.c 89ae9d9959010022a14bb36dea1b360da760b092 F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39 F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f @@ -1495,7 +1495,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 664c132dabe4a871d5c39c11b339f871ca3a5d31 -R c95d80b350856738e8dbac827a63287b +P 5c966f200018043f5258eb03e043bb25c7766131 +R f374868f610dd3d0429b813be905b071 U mistachkin -Z 5ee041c65db3cfb46a182fca07281d4b +Z 313307f37a580f7772d82428c7123b20 diff --git a/manifest.uuid b/manifest.uuid index aeff037a85..41c0c8e659 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5c966f200018043f5258eb03e043bb25c7766131 \ No newline at end of file +7c2cd4b05f88a759bdf72d3a249db5984fd7105d \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index a39917af99..b33d803ba2 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -47,10 +47,10 @@ static const char * const azCompileOpt[] = { #endif #if defined(_MSC_VER) "COMPILER=msvc-" CTIMEOPT_VAL(_MSC_VER), -#elif defined(__GNUC__) && defined(__VERSION__) - "COMPILER=gcc-" __VERSION__, #elif defined(__clang__) && defined(__clang_version__) "COMPILER=clang-" __clang_version__, +#elif defined(__GNUC__) && defined(__VERSION__) + "COMPILER=gcc-" __VERSION__, #endif #if SQLITE_COVERAGE_TEST "COVERAGE_TEST", From f35b8f83697d5dfbaab607f1cef7be738fdbaec0 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Sat, 28 May 2016 00:13:21 +0000 Subject: [PATCH 5/5] Clang can define _MSC_VER in some circumstances; therefore, check for Clang first. FossilOrigin-Name: 3f710bc3617691fa7432a24f1410d4651ca181b6 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/ctime.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 43de9fbb03..b6da3f6920 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Check\sfor\sClang\sbefore\sGCC. -D 2016-05-27T21:13:43.995 +C Clang\scan\sdefine\s_MSC_VER\sin\ssome\scircumstances;\stherefore,\scheck\sfor\sClang\sfirst. +D 2016-05-28T00:13:21.036 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7 @@ -329,7 +329,7 @@ F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/build.c 785fa789319d93c6ae20efbd01d4da9ce8f8a793 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c 89ae9d9959010022a14bb36dea1b360da760b092 +F src/ctime.c 999a828425b35b8092a8cde25690e71c20906344 F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39 F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f @@ -1495,7 +1495,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 5c966f200018043f5258eb03e043bb25c7766131 -R f374868f610dd3d0429b813be905b071 +P 7c2cd4b05f88a759bdf72d3a249db5984fd7105d +R 49f2ff6c03dd42bcf8b96859a75667c2 U mistachkin -Z 313307f37a580f7772d82428c7123b20 +Z 7fd0da57a78dfad092dddeef636c580c diff --git a/manifest.uuid b/manifest.uuid index 41c0c8e659..5f707fe176 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7c2cd4b05f88a759bdf72d3a249db5984fd7105d \ No newline at end of file +3f710bc3617691fa7432a24f1410d4651ca181b6 \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index b33d803ba2..589cabc1ab 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -45,10 +45,10 @@ static const char * const azCompileOpt[] = { #if SQLITE_CHECK_PAGES "CHECK_PAGES", #endif -#if defined(_MSC_VER) - "COMPILER=msvc-" CTIMEOPT_VAL(_MSC_VER), -#elif defined(__clang__) && defined(__clang_version__) +#if defined(__clang__) && defined(__clang_version__) "COMPILER=clang-" __clang_version__, +#elif defined(_MSC_VER) + "COMPILER=msvc-" CTIMEOPT_VAL(_MSC_VER), #elif defined(__GNUC__) && defined(__VERSION__) "COMPILER=gcc-" __VERSION__, #endif