From 091c8dfd4c09098d29f8bd129d993e8a7788d61a Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Sat, 12 Dec 1998 13:48:07 -0800 Subject: [PATCH] Loks of changes so we can better compile from source. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit � Loks of changes so we can better compile from source. See ChangeLog. From-SVN: r24278 --- gcc/java/class.c | 28 ++++++++++++++++++++++++++++ gcc/java/jcf-dump.c | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/gcc/java/class.c b/gcc/java/class.c index 76f2cb28b0e..49c543b81c7 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -637,6 +637,34 @@ build_class_ref (type) { char *name; char buffer[25]; + if (flag_emit_class_files) + { + char *prim_class_name; + tree prim_class; + if (type == char_type_node) + prim_class_name = "java.lang.Character"; + else if (type == boolean_type_node) + prim_class_name = "java.lang.Boolean"; + else if (type == byte_type_node) + prim_class_name = "java.lang.Byte"; + else if (type == short_type_node) + prim_class_name = "java.lang.Short"; + else if (type == int_type_node) + prim_class_name = "java.lang.Integer"; + else if (type == long_type_node) + prim_class_name = "java.lang.Long"; + else if (type == float_type_node) + prim_class_name = "java.lang.Float"; + else if (type == double_type_node) + prim_class_name = "java.lang.Double"; + else if (type == void_type_node) + prim_class_name = "java.lang.Void"; + else + fatal ("internal error - bad type to build_class_ref"); + prim_class = lookup_class (get_identifier (prim_class_name)); + return build (COMPONENT_REF, NULL_TREE, + prim_class, TYPE_identifier_node); + } decl_name = TYPE_NAME (type); if (TREE_CODE (decl_name) == TYPE_DECL) decl_name = DECL_NAME (decl_name); diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c index f9be7bdf28f..d5a47b32d80 100644 --- a/gcc/java/jcf-dump.c +++ b/gcc/java/jcf-dump.c @@ -792,7 +792,7 @@ DEFUN(main, (argc, argv), for (; argi < argc; argi++) { char *arg = argv[argi]; - char* class_filename = find_class (arg, strlen (arg), jcf, 1); + char* class_filename = find_class (arg, strlen (arg), jcf, 0); if (class_filename == NULL) class_filename = find_classfile (arg, jcf, NULL); if (class_filename == NULL) -- 2.30.2