[PATCH] Remove builtin-types.def from java front-end

[Roger Sayle <roger at eyesopen dot com>]

Many thanks to Diego Novillo for reminding me.  The following patch
removes the last dependence of gcj on builtin-types.def.  Since my
patches to overhaul the java front-end's handling of builtins, the
builtin_type enumeration in builtins.c has been completely unused.
This patch finally removes it, and the dependency from the Makefile.

Sorry for forgetting to do this earlier.


The following patch has been tested on i686-pc-linux-gnu with a full
"make bootstrap", all languages except treelang, and regression tested
with a top-level "make -k check" with no new failures.

Ok for mainline?


2003-08-18  Roger Sayle  <roger@eyesopen.com>

	* builtins.c (enum builtin_type): Delete unused enumeration.
	* Make-lang.in (java/builtins.o): Remove builtin-types.def
	dependency.


Index: builtins.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/builtins.c,v
retrieving revision 1.19
diff -c -3 -p -r1.19 builtins.c
*** builtins.c	8 Jun 2003 18:17:52 -0000	1.19
--- builtins.c	19 Aug 2003 01:54:07 -0000
*************** The Free Software Foundation is independ
*** 35,67 ****
  #include "langhooks.h"
  #include "java-tree.h"

- enum builtin_type
- {
- #define DEF_PRIMITIVE_TYPE(NAME, VALUE) NAME,
- #define DEF_FUNCTION_TYPE_0(NAME, RETURN) NAME,
- #define DEF_FUNCTION_TYPE_1(NAME, RETURN, ARG1) NAME,
- #define DEF_FUNCTION_TYPE_2(NAME, RETURN, ARG1, ARG2) NAME,
- #define DEF_FUNCTION_TYPE_3(NAME, RETURN, ARG1, ARG2, ARG3) NAME,
- #define DEF_FUNCTION_TYPE_4(NAME, RETURN, ARG1, ARG2, ARG3, ARG4) NAME,
- #define DEF_FUNCTION_TYPE_VAR_0(NAME, RETURN) NAME,
- #define DEF_FUNCTION_TYPE_VAR_1(NAME, RETURN, ARG1) NAME,
- #define DEF_FUNCTION_TYPE_VAR_2(NAME, RETURN, ARG1, ARG2) NAME,
- #define DEF_FUNCTION_TYPE_VAR_3(NAME, RETURN, ARG1, ARG2, ARG3) NAME,
- #define DEF_POINTER_TYPE(NAME, TYPE) NAME,
- #include "builtin-types.def"
- #undef DEF_PRIMITIVE_TYPE
- #undef DEF_FUNCTION_TYPE_0
- #undef DEF_FUNCTION_TYPE_1
- #undef DEF_FUNCTION_TYPE_2
- #undef DEF_FUNCTION_TYPE_3
- #undef DEF_FUNCTION_TYPE_4
- #undef DEF_FUNCTION_TYPE_VAR_0
- #undef DEF_FUNCTION_TYPE_VAR_1
- #undef DEF_FUNCTION_TYPE_VAR_2
- #undef DEF_FUNCTION_TYPE_VAR_3
- #undef DEF_POINTER_TYPE
-   BT_LAST
- };

  static tree max_builtin (tree, tree);
  static tree min_builtin (tree, tree);
--- 35,40 ----
Index: Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Make-lang.in,v
retrieving revision 1.116
diff -c -3 -p -r1.116 Make-lang.in
*** Make-lang.in	13 Aug 2003 07:08:29 -0000	1.116
--- Make-lang.in	19 Aug 2003 01:54:07 -0000
*************** java/boehm.o: java/boehm.c $(CONFIG_H) $
*** 286,293 ****
  java/buffer.o: java/buffer.c $(CONFIG_H) java/buffer.h $(SYSTEM_H) coretypes.h \
    $(TM_H) toplev.h
  java/builtins.o: java/builtins.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
!   $(JAVA_TREE_H) $(GGC_H) flags.h builtin-types.def langhooks.h \
!   gt-java-builtins.h
  java/check-init.o: java/check-init.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) \
    coretypes.h $(TM_H) toplev.h
  java/class.o: java/class.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
--- 286,292 ----
  java/buffer.o: java/buffer.c $(CONFIG_H) java/buffer.h $(SYSTEM_H) coretypes.h \
    $(TM_H) toplev.h
  java/builtins.o: java/builtins.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
!   $(JAVA_TREE_H) $(GGC_H) flags.h langhooks.h gt-java-builtins.h
  java/check-init.o: java/check-init.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) \
    coretypes.h $(TM_H) toplev.h
  java/class.o: java/class.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \


Roger
--
Roger Sayle,                         E-mail: roger@eyesopen.com
OpenEye Scientific Software,         WWW: http://www.eyesopen.com/
Suite 1107, 3600 Cerrillos Road,     Tel: (+1) 505-473-7385
Santa Fe, New Mexico, 87507.         Fax: (+1) 505-473-0833