https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61649
--- Comment #5 from Richard PALO <richard at netbsd dot org> --- kind reminder to push these two patches: 1) https://gcc.gnu.org/bugzilla/attachment.cgi?id=33031 2) and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61649#c1 (*) * NB https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52168 I believe I already answered Jonathan's question in that since only a [preceeding] line of context is being added, there is no additional '#endif' to add. BTW, this line of context is necessary anyway, because if either Oracle Solaris or Illumos change this code section, for example by fixing it as gcc currently does here, it will prevent fixincl.x from action which would actually *break* the file.