Sync toplevel with GCC, merge.