Take a look at upstream change [1] done for AArch64 support. It simplified code in similar way as sh4.diff did. 1. http://sourceforge.net/p/indi/code/1610/