gencodes.c includes pa.h twice causing bootstrap failure

["John David Anglin" <dave at hiauly1 dot hia dot nrc dot ca>]

With the current cvs for the last few days, the following error occurs
in stage 2 under hpux 10.20:

stage1/xgcc -Bstage1/ -B/usr/local/hppa1.1-hp-hpux10.20/bin/ -c  -DIN_GCC    -g -O3 -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wtraditional -pedantic -Wno-long-long  -DHAVE_CONFIG_H -DGENERATOR_FILE    -I. -I. -I../../gcc -I../../gcc/. -I../../gcc/config -I../../gcc/../include ../../gcc/gencodes.c
In file included from tm.h:7,
                 from ../../gcc/config/pa/xm-pahpux.h:47,
		 from config.h:7,
		 from genrtl.h:3,
		 from ../../gcc/rtl.h:1538,
		 from ../../gcc/gencodes.c:27:
../../gcc/config/pa/pa.h:26: redeclaration of `enum cmp_type'
../../gcc/config/pa/pa.h:27: conflicting types for `CMP_SI'
../../gcc/config/pa/pa.h:27: previous declaration of `CMP_SI'
...

At line 25, gencodes.c includes hconfig.h which also includes pa/xm-pahpux.h.
It looks like `gengenrtl -h' is broken.  This is start of genrtl.h:

/* Generated automatically by gengenrtl from rtl.def.  */

#include "config.h"
#include "system.h"
#include "obstack.h"
#include "rtl.h"
#include "ggc.h"

The file genrtl.h is identical to genrtl.c.

Dave
-- 
J. David Anglin                                  dave.anglin@nrc.ca
National Research Council of Canada              (613) 990-0752 (FAX: 952-6605)