+1998-11-12 Tom Tromey <tromey@cygnus.com>
+
+ * jvspec.c (lang_specific_driver): Correctly handle case where
+ GC_NAME not defined.
+
1998-11-11 Tom Tromey <tromey@cygnus.com>
* jvspec.c (GC_NAME): New define.
*/
int need_thread = 1;
+ /* By default, we throw in the gc library (if one is required). */
+ int need_gc = 1;
+
/* The total number of arguments with the new stuff. */
int argc;
saw_libjava = 1;
else if (strcmp (argv[i], "-lc") == 0)
args[i] |= WITHLIBC;
+#ifdef GC_NAME
else if (strcmp (argv[i], GC_NAME) == 0)
- args[i] |= GCLIB;
+ {
+ args[i] |= GCLIB;
+ need_gc = 0;
+ }
+#endif
#ifdef THREAD_NAME
else if (strcmp (argv[i], THREAD_NAME) == 0)
{
num_args = argc + added;
if (will_link)
- num_args += need_math + need_thread;
+ num_args += need_math + need_thread + need_gc;
if (saw_C)
{
num_args += 3;
{
lang_specific_extra_outfiles++;
}
- arglist = (char **) xmalloc ((num_args + 4) * sizeof (char *));
+ arglist = (char **) xmalloc ((num_args + 1) * sizeof (char *));
for (i = 0, j = 0; i < argc; i++, j++)
{