I noticed that a command starting with "gcjh -jni" reports "gcjh: only one of -jni or -cni may be used" though no -cni was given. After inspecting the code, I believe that "gjavah -jni -cni" would not complain though.
Created attachment 150612 [details] patch, not tested
Wow, embarrassing bug. Your fix looks pretty good. I'm testing it, if it works ok I will check it in. I'll update the bug when finished.
Ok, I've checked this in to classpath, gcc trunk, and the gcc rh 4.1 branch. On the branch it is r123241.