More UPS fixes, including adjusting to the disapeared UPS source.
Move building of GCC into its own cfg file.