diff options
| author | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-13 21:06:45 +0000 |
|---|---|---|
| committer | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-13 21:06:45 +0000 |
| commit | c03155ca3d52432929093e78d5cd8d7ffe049c52 (patch) | |
| tree | 7f1bfdb9bfda24be988ebc08cc8f50b3383d3ae9 /gcc/java/jvgenmain.c | |
| parent | f4e55e4d4f6f95e335c8e5f86224e6f4ee20d8d9 (diff) | |
| download | gcc-c03155ca3d52432929093e78d5cd8d7ffe049c52.tar.gz | |
2000-10-11 Rodney Brown <RodneyBrown@mynd.com>
* java-tree.h: Constify current_encoding.
* lang.c: Constify current_encoding.
2000-10-10 Jeff Sturm <jeff.sturm@appnet.com>
* jvgenmain.c (class_mangling_suffix): Omit `.'.
(main): Use `$' when NO_DOLLAR_IN_LABEL is not set, otherwise `.'.
2000-10-10 Alexandre Petit-Bianco <apbianco@cygnus.com>
* expr.c (java_lang_expand_expr): Reinstall 1999-08-14 Anthony's
patch. Fixes gcj/340.
(http://gcc.gnu.org/ml/gcc-patches/2000-10/msg00374.html)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36864 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/jvgenmain.c')
| -rw-r--r-- | gcc/java/jvgenmain.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c index 6c2670d29ae..a24ea03fceb 100644 --- a/gcc/java/jvgenmain.c +++ b/gcc/java/jvgenmain.c @@ -34,7 +34,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ const char main_method_prefix[] = "main__"; const char main_method_suffix[] = "Pt6JArray1ZPQ34java4lang6String"; -const char class_mangling_suffix[] = ".class$"; +const char class_mangling_suffix[] = "class$"; struct obstack name_obstack; @@ -155,8 +155,13 @@ main (int argc, const char **argv) } fprintf (stream, " 0\n};\n\n"); - fprintf (stream, "extern int class __attribute__ ((alias (\"_%s%s\")));\n", +#ifndef NO_DOLLAR_IN_LABEL + fprintf (stream, "extern int class __attribute__ ((alias (\"_%s$%s\")));\n", mangled_classname, class_mangling_suffix); +#else + fprintf (stream, "extern int class __attribute__ ((alias (\"_%s.%s\")));\n", + mangled_classname, class_mangling_suffix); +#endif fprintf (stream, "int main (int argc, const char **argv)\n"); fprintf (stream, "{\n"); fprintf (stream, " _Jv_Compiler_Properties = props;\n"); |