4.0 Patch: Fix PR java/21418

[Bryce McKinlay]

Another patch backport from HEAD. Ranjit's java/21418 fix and also a 
small change from Per that it depends on. These are needed to reliably 
build classpath. I'm checking them in.

Bryce

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PR21418-gcc40.patch
Type: text/x-patch
Size: 1744 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20051001/68a0f54b/attachment.bin>