diff options
author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-03 15:28:16 +0000 |
---|---|---|
committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-03 15:28:16 +0000 |
commit | c12658407f04b6b664cd69a5142b30e79f2feee0 (patch) | |
tree | 60fe445d5b46b75e3d08f3d3944f489dda85b945 /gcc/java/jvgenmain.c | |
parent | d88977362f2ba59a2210028ab26a49fd61906fa4 (diff) | |
download | gcc-c12658407f04b6b664cd69a5142b30e79f2feee0.tar.gz |
2007-04-03 Andrew Haley <aph@redhat.com>
* jvgenmain.c (main): Change main to use class$, not class$$.
(do_mangle_classname): Likewise.
* class.c (hide): New function.
(add_field): Hide everything that shouldn't be visible outside a
DSO.
(build_static_class_ref): Likewise.
(build_classdollar_field): Likewise.
(make_class_data): Likewise.
(layout_class_method): Likewise.
* expr.c (special_method_p): New function.
* class.c (push_class): Don't bogusly guess the source filename.
* jcf-parse.c (give_name_to_class): Don't set input_location from
DECL_ARTIFICIAL decls.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123476 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/jvgenmain.c')
-rw-r--r-- | gcc/java/jvgenmain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c index f4fb0ba38ab..0bce0043b71 100644 --- a/gcc/java/jvgenmain.c +++ b/gcc/java/jvgenmain.c @@ -143,8 +143,8 @@ main (int argc, char **argv) fprintf (stream, " JvRunMainName (\"%s\", argc, argv);\n", classname); else { - fprintf (stream, " extern void *%s;\n", mangled_classname); - fprintf (stream, " JvRunMain (%s, argc, argv);\n", mangled_classname); + fprintf (stream, " extern char %s;\n", mangled_classname); + fprintf (stream, " JvRunMain (&%s, argc, argv);\n", mangled_classname); } fprintf (stream, "}\n"); if (stream != stdout && fclose (stream) != 0) @@ -176,7 +176,7 @@ do_mangle_classname (const char *string) count++; } append_gpp_mangled_name (&ptr [-count], count); - obstack_grow (mangle_obstack, "7class$$E", strlen ("7class$$E")); + obstack_grow (mangle_obstack, "6class$E", strlen ("6class$E")); obstack_1grow (mangle_obstack, '\0'); return obstack_finish (mangle_obstack); } |