Port 2 fixes from crosstool_ng_prep