jvspec.c (lang_specific_pre_link): Re-arrange the linker command line so the jvgenmain-generated main program...

* jvspec.c (lang_specific_pre_link):  Re-arrange the linker
        command line so the jvgenmain-generated main program comes first.

From-SVN: r42270
This commit is contained in:
Per Bothner 2001-05-18 11:34:51 -07:00 committed by Per Bothner
parent 3a5a9edc34
commit 9d28960448
2 changed files with 20 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2001-05-18 Per Bothner <per@bothner.com>
* jvspec.c (lang_specific_pre_link): Re-arrange the linker
command line so the jvgenmain-generated main program comes first.
2001-05-15 Tom Tromey <tromey@redhat.com>
* class.c (build_utf8_ref): Don't generate identifier based on

View File

@ -525,9 +525,23 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
int
lang_specific_pre_link ()
{
int err;
if (main_class_name == NULL)
return 0;
input_filename = main_class_name;
input_filename_length = strlen (main_class_name);
return do_spec (jvgenmain_spec);
err = do_spec (jvgenmain_spec);
if (err == 0)
{
/* Shift the outfiles array so the generated main comes first.
This is important when linking against (non-shared) libraries,
since otherwise we risk (a) nothing getting linked or
(b) 'main' getting picked up from a library. */
int i = n_infiles;
const char *generated = outfiles[i];
while (--i >= 0)
outfiles[i + 1] = outfiles[i];
outfiles[0] = generated;
}
return err;
}