add back patch to fix building on avr32 and cris