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/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org