The c-opts.c change to include tm.h seems independent of the rest of the patch, and is incorrect since the file already has an explicit tm.h include with a comment saying why it's included. I think it would be a good idea for the java/expr.c include (which I can't approve, Java patches should best be CC:ed to java-patches) to have a comment saying what target macros are used (BITS_PER_UNIT INT_TYPE_SIZE MODIFY_JNI_METHOD_CALL PARM_BOUNDARY TARGET_VTABLE_USES_DESCRIPTORS) - in general that applies to any tm.h includes in files that "shouldn't" include tm.h.
-- Joseph S. Myers jos...@codesourcery.com