Avoid rebuilding tcl/tk.
Merge x86 changes into AMD64.
2 files changed