mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-07 19:27:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

jvspec.c (GC_NAME): New define.

Browse Source 
* jvspec.c (GC_NAME): New define.
	(lang_specific_driver): Use GC_NAME.  Add GC_NAME to command line
	if required.
	* Make-lang.in (jvspec.o): Define WITH_GC_<name>.

From-SVN: r23612
This commit is contained in:
Tom Tromey 1998-11-11 22:48:27 +00:00 committed by Tom Tromey
parent df37e3db8e
commit aaff4ee49e
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/java/ChangeLog
View File

@ -1,3 +1,10 @@
1998-11-11 Tom Tromey <tromey@cygnus.com>
* jvspec.c (GC_NAME): New define.
(lang_specific_driver): Use GC_NAME. Add GC_NAME to command line
if required.
* Make-lang.in (jvspec.o): Define WITH_GC_<name>.
Wed Nov 11 19:08:52 1998 Per Bothner <bothner@cygnus.com>
* jcf-dump.c (TABLE_SWITCH): Fix typos.

2
gcc/java/Make-lang.in
View File

@ -84,7 +84,7 @@ $(GCJ).c: $(srcdir)/gcc.c
$(LN_S) $(srcdir)/gcc.c $@
jvspec.o: $(srcdir)/java/jvspec.c
$(CC) -c -DWITH_THREAD_$(GCC_THREAD_FILE) \
$(CC) -c -DWITH_THREAD_$(GCC_THREAD_FILE) -DWITH_GC_$(JAVAGC) \
$(ALL_CFLAGS) $(ALL_CPPFLAGS) \
$(INCLUDES) $(srcdir)/java/jvspec.c

17
gcc/java/jvspec.c
View File

@ -35,6 +35,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#define THREAD_NAME "-lqthreads"
#endif
#if defined (WITH_GC_boehm)
#define GC_NAME "-lgc"
#endif
/* This bit is set if we saw a `-xfoo' language specification. */
#define LANGSPEC (1<<1)
/* This bit is set if they did `-lm' or `-lmath'. */
@ -231,7 +235,7 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries)
saw_libjava = 1;
else if (strcmp (argv[i], "-lc") == 0)
args[i] |= WITHLIBC;
else if (strcmp (argv[i], "-lgc") == 0)
else if (strcmp (argv[i], GC_NAME) == 0)
args[i] |= GCLIB;
#ifdef THREAD_NAME
else if (strcmp (argv[i], THREAD_NAME) == 0)
@ -372,7 +376,7 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries)
{
lang_specific_extra_outfiles++;
}
arglist = (char **) xmalloc ((num_args + 1) * sizeof (char *));
arglist = (char **) xmalloc ((num_args + 4) * sizeof (char *));
for (i = 0, j = 0; i < argc; i++, j++)
{
@ -474,10 +478,15 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries)
added_libraries++;
}
/* FIXME: we need a way to know when the GC library should be
added. Then we can add it if the user hasn't already. */
if (saw_gc)
arglist[j++] = saw_gc;
#ifdef GC_NAME
else if (library)
{
arglist[j++] = GC_NAME;
added_libraries++;
}
#endif
/* Thread library must come after GC library as well as after
-ljava. */