merge 8.7: amend to [98006f00ac471be5] - simplification and deduplica… #4711

Job	Run time
gcc	32m 30s
gcc	11m 24s
gcc	11m 24s
gcc (CFLAGS=-DTCL_NO_DEPRECATED=1)	11m 16s
gcc (CFLAGS=-DTCL_NO_DEPRECATED=1)	11m 16s
gcc (CFLAGS=-DTCL_NO_DEPRECATED=1)	11m 16s
gcc (--disable-shared)	11m 32s
gcc (--disable-shared)	11m 32s
gcc (--disable-shared)	11m 32s
msvc	10m 21s
msvc	10m 21s
msvc	1s
msvc (CHECKS=nodep)	10m 20s
msvc (CHECKS=nodep)	10m 20s
msvc (CHECKS=nodep)	10m 20s
gcc (--disable-zipfs)	11m 11s
gcc (--disable-zipfs)	11m 11s
gcc (--disable-zipfs)	11m 11s
msvc (OPTS=static)	10m 24s
msvc (OPTS=static)	10m 24s
msvc (OPTS=static)	10m 24s
msvc (OPTS=noembed)	10m 24s
msvc (OPTS=noembed)	10m 24s
msvc (OPTS=noembed)	10m 24s
gcc (--enable-symbols)	11m 46s
gcc (--enable-symbols)	11m 46s
gcc (--enable-symbols)	11m 46s
msvc (OPTS=symbols)	8m 40s
msvc (OPTS=symbols)	8m 40s
msvc (OPTS=symbols)	8m 40s
gcc (--enable-symbols=mem)	13m 9s
gcc (--enable-symbols=mem)	13m 9s
gcc (--enable-symbols=mem)	13m 9s
msvc (OPTS=symbols STATS=compdbg,memdbg)	6m 47s
msvc (OPTS=symbols STATS=compdbg,memdbg)	6m 47s
msvc (OPTS=symbols STATS=compdbg,memdbg)	6m 47s
gcc (--enable-symbols=all)	14m 44s
gcc (--enable-symbols=all)	14m 44s
gcc (--enable-symbols=all)	14m 44s
	7h 16m 40s

Provide feedback