new-regalloc merge also broke ARM taget

[jeroen dobbelaere]

gcc/gcc/ra.h and gcc/gcc/config/arm/arm.h both define
'NUM_REGS(x)'

resulting in :


cc -DIN_GCC    -g  -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wtraditional -pedantic -Wno-long-long  -DHAVE_CONFIG_H    -I. -I. -I../../gcc/gcc -I../../gcc/gcc/. -I../../gcc/gcc/config -I../../gcc/gcc/../include \
   -DLOCALEDIR=\"/usr/local/gcc-3.2-cvs/share/locale\" \
   -c ../../gcc/gcc/intl.c -o intl.o
gcc -c -DIN_GCC    -g  -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wtraditional -pedantic -Wno-long-long  -DHAVE_CONFIG_H    -I. -I. -I../../gcc/gcc -I../../gcc/gcc/. -I../../gcc/gcc/config -I../../gcc/gcc/../include 
../../gcc/gcc/ra.c -o ra.o
In file included from ../../gcc/gcc/ra.c:39:
../../gcc/gcc/ra.h:506:1: warning: "NUM_REGS" redefined
../../gcc/gcc/config/arm/arm.h:861:1: warning: this is the location of the previous definition
../../gcc/gcc/ra.c: In function `init_ra':
../../gcc/gcc/ra.c:494: invalid type argument of `->'
../../gcc/gcc/ra.c:494: invalid type argument of `->'
../../gcc/gcc/ra.c:499: invalid type argument of `->'
../../gcc/gcc/ra.c:499: invalid type argument of `->'
../../gcc/gcc/ra.c:510: invalid type argument of `->'
../../gcc/gcc/ra.c:510: invalid type argument of `->'
../../gcc/gcc/ra.c:513: invalid type argument of `->'
../../gcc/gcc/ra.c:513: invalid type argument of `->'
../../gcc/gcc/ra.c:550: invalid type argument of `->'
../../gcc/gcc/ra.c:550: invalid type argument of `->'


How should this conflict be resolved ?
Modify 'ra.h' (and related files) or
'arm.h' (and related files), or
both (adding a namespace identifier) ?

Greetings
-- 
Jeroen Dobbelaere
Embedded Software Engineer

ACUNIA Embedded Solutions
http://www.acunia.com/aes