- /* Specific flags and argument handling of the front-end of the
+/* Specific flags and argument handling of the front-end of the
GNU compiler for the Java(TM) language.
- Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+ Free Software Foundation, Inc.
-This file is part of GNU CC.
+This file is part of GCC.
-GNU CC is free software; you can redistribute it and/or modify
+GCC is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
+along with GCC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
#include "config.h"
#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
#include "gcc.h"
/* Name of spec file. */
#define JAVA_FILE_ARG (1<<3)
/* True if this arg is a .class input file name. */
#define CLASS_FILE_ARG (1<<4)
+/* True if this arg is a .zip or .jar input file name. */
+#define ZIP_FILE_ARG (1<<5)
+/* True if this arg is @FILE - where FILE contains a list of filenames. */
+#define INDIRECT_FILE_ARG (1<<6)
+/* True if this arg is a resource file. */
+#define RESOURCE_FILE_ARG (1<<7)
-static char *find_spec_file PARAMS ((const char *));
+static char *find_spec_file (const char *);
+static int verify_class_name (const char *);
static const char *main_class_name = NULL;
int lang_specific_extra_outfiles = 0;
-/* Once we have the proper support in jc1 (and gcc.c) working,
- set COMBINE_INPUTS to one. This enables combining multiple *.java
- and *.class input files to be passed to a single jc1 invocation. */
-#define COMBINE_INPUTS 0
+/* True if we should add -shared-libgcc to the command-line. */
+int shared_libgcc = 1;
-const char jvgenmain_spec[] =
- "jvgenmain %{D*} %i %{!pipe:%umain.i} |\n\
- cc1 %{!pipe:%Umain.i} %1 \
+static const char jvgenmain_spec[] =
+ "jvgenmain %{D*} %b %m.i |\n\
+ cc1 %m.i %1 \
%{!Q:-quiet} -dumpbase %b.c %{d*} %{m*} %{a*}\
%{g*} %{O*} \
%{v:-version} %{pg:-p} %{p}\
- %{<fbounds-check} %{<fno-bounds-check}\
- %{<fassume-compiled} %{<fno-assume-compiled}\
- %{<femit-class-file} %{<femit-class-files} %{<fencoding*}\
- %{<fuse-boehm-gc} %{<fhash-synchronization} %{<fjni}\
- %{<fclasspath*} %{<fCLASSPATH*} %{<foutput-class-dir}\
- %{<fuse-divide-subroutine} %{<fno-use-divide-subroutine}\
+ %<fbounds-check %<fno-bounds-check\
+ %<fassume-compiled* %<fno-assume-compiled*\
+ %<fcompile-resource* %<fassert %<fno-assert \
+ %<femit-class-file %<femit-class-files %<fencoding*\
+ %<fuse-boehm-gc %<fhash-synchronization %<fjni\
+ %<findirect-dispatch \
+ %<fno-store-check %<foutput-class-dir\
+ %<fclasspath* %<fCLASSPATH* %<fbootclasspath*\
+ %<fextdirs*\
+ %<fuse-divide-subroutine %<fno-use-divide-subroutine\
+ %<fcheck-references %<fno-check-references\
+ %<ffilelist-file\
%{f*} -fdollars-in-identifiers\
%{aux-info*}\
%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
- %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%Umain.s}} |\n\
- %{!S:as %a %Y -o %d%w%umain%O %{!pipe:%Umain.s} %A\n }";
+ %{S:%W{o*}%{!o*:-o %b.s}}\
+ %(invoke_as)";
/* Return full path name of spec file if it is in DIR, or NULL if
not. */
static char *
-find_spec_file (dir)
- const char *dir;
+find_spec_file (const char *dir)
{
char *spec;
int x;
struct stat sb;
- spec = (char *) xmalloc (strlen (dir) + sizeof (SPEC_FILE)
- + sizeof ("-specs=") + 4);
+ spec = xmalloc (strlen (dir) + sizeof (SPEC_FILE)
+ + sizeof ("-specs=") + 4);
strcpy (spec, "-specs=");
x = strlen (spec);
strcat (spec, dir);
return NULL;
}
+/* FIXME: these should come from lex.h. */
+#define JAVA_START_CHAR_P(c) (c < 128 && (ISIDST (c) || c == '$'))
+#define JAVA_PART_CHAR_P(c) (c < 128 \
+ && (ISIDNUM (c) \
+ || c == '$' \
+ || (c >= 0x00 && c <= 0x08) \
+ || (c >= 0x0e && c <= 0x1b) \
+ || c == 0x7f))
+
+/* Verify that NAME is a valid Java class name that might contain
+ `main'. Return 0 on failure. */
+static int
+verify_class_name (const char *name)
+{
+ /* FIXME: what encoding do we use for command-line arguments? For
+ now we assume plain ASCII, which of course is wrong. */
+ while (*name)
+ {
+ int ch = *name++;
+ if (ch < 0 || ! JAVA_START_CHAR_P (ch))
+ return 0;
+ while (*name)
+ {
+ ch = *name++;
+ if (ch < 0)
+ return 0;
+ /* We found a break between class names. Next character
+ must be an identifier start again. */
+ if (ch == '.')
+ break;
+ if (! JAVA_PART_CHAR_P (ch))
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
void
-lang_specific_driver (in_argc, in_argv, in_added_libraries)
- int *in_argc;
- const char *const **in_argv;
- int *in_added_libraries;
+lang_specific_driver (int *in_argc, const char *const **in_argv,
+ int *in_added_libraries)
{
int i, j;
- /* If non-zero, the user gave us the `-v' flag. */
+ /* If nonzero, the user gave us the `-v' flag. */
int saw_verbose_flag = 0;
+ int saw_save_temps = 0;
+
/* This will be 0 if we encounter a situation where we should not
link in libgcj. */
int library = 1;
-#if COMBINE_INPUTS
/* This will be 1 if multiple input files (.class and/or .java)
should be passed to a single jc1 invocation. */
int combine_inputs = 0;
- /* Index of last .java or .class argument. */
- int last_input_index;
-
- /* A buffer containing the concatenation of the inputs files
- (e.g. "foo.java&bar.class&baz.class"). if combine_inputs. */
- char* combined_inputs_buffer;
-
- /* Next available location in combined_inputs_buffer. */
- int combined_inputs_pos;
-
/* Number of .java and .class source file arguments seen. */
int java_files_count = 0;
int class_files_count = 0;
+ /* Number of .zip or .jar file arguments seen. */
+ int zip_files_count = 0;
+ /* Number of '@FILES' arguments seen. */
+ int indirect_files_count = 0;
- /* Cumulative length of the .java and .class source file names. */
- int java_files_length = 0;
- int class_files_length = 0;
-#endif
+ /* Name of file containing list of files to compile. */
+ char *filelist_filename = 0;
+
+ FILE *filelist_file = 0;
/* The number of arguments being added to what's in argv, other than
- libraries. We use this to track the number of times we've inserted
- -xc++/-xnone. */
+ libraries. */
int added = 2;
/* Used to track options that take arguments, so we don't go wrapping
/* The new argument list will be contained in this. */
const char **arglist;
- /* Non-zero if we saw a `-xfoo' language specification on the
+ /* Nonzero if we saw a `-xfoo' language specification on the
command line. Used to avoid adding our own -xc++ if the user
already gave a language for the file. */
int saw_speclang = 0;
+#if 0
/* "-lm" or "-lmath" if it appears on the command line. */
const char *saw_math ATTRIBUTE_UNUSED = 0;
/* Saw `-lgcj' on command line. */
int saw_libgcj ATTRIBUTE_UNUSED = 0;
+#endif
- /* Saw -C or -o option, respectively. */
+ /* Saw --resource, -C or -o options, respectively. */
+ int saw_resource = 0;
int saw_C = 0;
int saw_o = 0;
/* The total number of arguments with the new stuff. */
int num_args = 1;
- /* Non-zero if linking is supposed to happen. */
+ /* Nonzero if linking is supposed to happen. */
int will_link = 1;
- /* Non-zero if we want to find the spec file. */
+ /* Nonzero if we want to find the spec file. */
int want_spec_file = 1;
/* The argument we use to specify the spec file. */
argv = *in_argv;
added_libraries = *in_added_libraries;
- args = (int *) xcalloc (argc, sizeof (int));
+ args = xcalloc (argc, sizeof (int));
for (i = 1; i < argc; i++)
{
{
saw_C = 1;
want_spec_file = 0;
-#if COMBINE_INPUTS
- combine_inputs = 1;
-#endif
if (library != 0)
added -= 2;
library = 0;
will_link = 0;
}
+ else if (strncmp (argv[i], "-fcompile-resource=", 19) == 0)
+ {
+ saw_resource = 1;
+ want_spec_file = 0;
+ if (library != 0)
+ --added;
+ library = 0;
+ will_link = 0;
+ }
else if (argv[i][1] == 'D')
saw_D = 1;
else if (argv[i][1] == 'g')
else if (argv[i][1] == 'O')
saw_O = 1;
else if ((argv[i][2] == '\0'
- && (char *)strchr ("bBVDUoeTuIYmLiA", argv[i][1]) != NULL)
+ && strchr ("bBVDUoeTuIYmLiA", argv[i][1]) != NULL)
|| strcmp (argv[i], "-Tdata") == 0
|| strcmp (argv[i], "-MT") == 0
|| strcmp (argv[i], "-MF") == 0)
saw_o = 1;
quote = argv[i];
}
- else if (strcmp(argv[i], "-classpath") == 0
- || strcmp(argv[i], "-CLASSPATH") == 0)
+ else if (strcmp (argv[i], "-classpath") == 0
+ || strcmp (argv[i], "-bootclasspath") == 0
+ || strcmp (argv[i], "-CLASSPATH") == 0
+ || strcmp (argv[i], "-encoding") == 0
+ || strcmp (argv[i], "-extdirs") == 0)
{
quote = argv[i];
added -= 1;
}
else if (library != 0
&& ((argv[i][2] == '\0'
- && (char *) strchr ("cSEM", argv[i][1]) != NULL)
+ && strchr ("cSEM", argv[i][1]) != NULL)
|| strcmp (argv[i], "-MM") == 0))
{
/* Don't specify libraries if we won't link, since that would
will_link = 0;
continue;
}
+ else if (strcmp (argv[i], "-save-temps") == 0)
+ saw_save_temps = 1;
+ else if (strcmp (argv[i], "-static-libgcc") == 0
+ || strcmp (argv[i], "-static") == 0)
+ shared_libgcc = 0;
else
/* Pass other options through. */
continue;
}
else
{
-#if COMBINE_INPUTS
int len;
-#endif
if (saw_speclang)
{
continue;
}
-#if COMBINE_INPUTS
+ if (saw_resource)
+ {
+ args[i] |= RESOURCE_FILE_ARG;
+ added += 2; /* for -xjava and -xnone */
+ }
+
+ if (argv[i][0] == '@')
+ {
+ args[i] |= INDIRECT_FILE_ARG;
+ indirect_files_count++;
+ added += 2; /* for -xjava and -xnone */
+ }
+
len = strlen (argv[i]);
if (len > 5 && strcmp (argv[i] + len - 5, ".java") == 0)
{
args[i] |= JAVA_FILE_ARG;
java_files_count++;
- java_files_length += len;
- last_input_index = i;
}
if (len > 6 && strcmp (argv[i] + len - 6, ".class") == 0)
{
args[i] |= CLASS_FILE_ARG;
class_files_count++;
- class_files_length += len;
- last_input_index = i;
}
-#endif
+ if (len > 4
+ && (strcmp (argv[i] + len - 4, ".zip") == 0
+ || strcmp (argv[i] + len - 4, ".jar") == 0))
+ {
+ args[i] |= ZIP_FILE_ARG;
+ zip_files_count++;
+ }
}
}
if (saw_D && ! main_class_name)
fatal ("can't specify `-D' without `--main'\n");
+ if (main_class_name && ! verify_class_name (main_class_name))
+ fatal ("`%s' is not a valid class name", main_class_name);
+
num_args = argc + added;
+ if (saw_resource)
+ {
+ if (! saw_o)
+ fatal ("--resource requires -o");
+ }
if (saw_C)
{
num_args += 3;
-#if COMBINE_INPUTS
- class_files_length = 0;
- num_args -= class_files_count;
+ if (class_files_count + zip_files_count > 0)
+ {
+ error ("warning: already-compiled .class files ignored with -C");
+ num_args -= class_files_count + zip_files_count;
+ class_files_count = 0;
+ zip_files_count = 0;
+ }
num_args += 2; /* For -o NONE. */
-#endif
if (saw_o)
fatal ("cannot specify both -C and -o");
}
-#if COMBINE_INPUTS
- if (saw_o && java_files_count + (saw_C ? 0 : class_files_count) > 1)
+ if ((saw_o && java_files_count + class_files_count + zip_files_count > 1)
+ || (saw_C && java_files_count > 1)
+ || (indirect_files_count > 0
+ && java_files_count + class_files_count + zip_files_count > 0))
combine_inputs = 1;
if (combine_inputs)
{
- int len = java_files_length + java_files_count - 1;
- num_args -= java_files_count;
- num_args++; /* Add one for the combined arg. */
- if (class_files_length > 0)
- {
- len += class_files_length + class_files_count - 1;
- num_args -= class_files_count;
- }
- combined_inputs_buffer = (char*) xmalloc (len);
- combined_inputs_pos = 0;
+ filelist_filename = make_temp_file ("jx");
+ if (filelist_filename == NULL)
+ fatal ("cannot create temporary file");
+ record_temp_file (filelist_filename, ! saw_save_temps, 0);
+ filelist_file = fopen (filelist_filename, "w");
+ if (filelist_file == NULL)
+ pfatal_with_name (filelist_filename);
+ num_args -= java_files_count + class_files_count + zip_files_count;
+ num_args += 2; /* for the combined arg and "-xjava" */
}
/* If we know we don't have to do anything, bail now. */
-#endif
#if 0
if (! added && ! library && main_class_name == NULL && ! saw_C)
{
num_args++;
num_args++;
- arglist = (const char **) xmalloc ((num_args + 1) * sizeof (char *));
+ if (combine_inputs || indirect_files_count > 0)
+ num_args += 1; /* for "-ffilelist-file" */
+ if (combine_inputs && indirect_files_count > 0)
+ fatal("using both @FILE with multiple files not implemented");
+
+ /* There's no point adding -shared-libgcc if we don't have a shared
+ libgcc. */
+#ifndef ENABLE_SHARED_LIBGCC
+ shared_libgcc = 0;
+#endif
+
+ num_args += shared_libgcc;
- for (i = 0, j = 0; i < argc; i++, j++)
+ arglist = xmalloc ((num_args + 1) * sizeof (char *));
+ j = 0;
+
+ for (i = 0; i < argc; i++, j++)
{
arglist[j] = argv[i];
if ((args[i] & PARAM_ARG) || i == 0)
continue;
+ if ((args[i] & RESOURCE_FILE_ARG) != 0)
+ {
+ arglist[j++] = "-xjava";
+ arglist[j++] = argv[i];
+ arglist[j] = "-xnone";
+ }
+
if (strcmp (argv[i], "-classpath") == 0
- || strcmp (argv[i], "-CLASSPATH") == 0)
+ || strcmp (argv[i], "-bootclasspath") == 0
+ || strcmp (argv[i], "-CLASSPATH") == 0
+ || strcmp (argv[i], "-encoding") == 0
+ || strcmp (argv[i], "-extdirs") == 0)
{
- char* patharg
- = (char*) xmalloc (strlen (argv[i]) + strlen (argv[i+1]) + 3);
- sprintf (patharg, "-f%s=%s", argv[i]+1, argv[i+1]);
- arglist[j] = patharg;
+ arglist[j] = concat ("-f", argv[i]+1, "=", argv[i+1], NULL);
i++;
continue;
}
if (strcmp (argv[i], "-d") == 0)
{
- char *patharg = (char *) xmalloc (sizeof ("-foutput-class-dir=")
- + strlen (argv[i + 1]) + 1);
- sprintf (patharg, "-foutput-class-dir=%s", argv[i + 1]);
- arglist[j] = patharg;
+ arglist[j] = concat ("-foutput-class-dir=", argv[i + 1], NULL);
++i;
continue;
}
continue;
}
- if ((args[i] & CLASS_FILE_ARG) && saw_C)
+ if ((args[i] & INDIRECT_FILE_ARG) != 0)
+ {
+ arglist[j++] = "-xjava";
+ arglist[j++] = argv[i]+1; /* Drop '@'. */
+ arglist[j] = "-xnone";
+ }
+
+ if ((args[i] & (CLASS_FILE_ARG|ZIP_FILE_ARG)) && saw_C)
{
--j;
continue;
}
-#if COMBINE_INPUTS
- if (combine_inputs && (args[i] & (CLASS_FILE_ARG|JAVA_FILE_ARG)) != 0)
+ if (combine_inputs
+ && (args[i] & (CLASS_FILE_ARG|JAVA_FILE_ARG|ZIP_FILE_ARG)) != 0)
{
- if (combined_inputs_pos > 0)
- combined_inputs_buffer[combined_inputs_pos++] = '&';
- strcpy (&combined_inputs_buffer[combined_inputs_pos], argv[i]);
- combined_inputs_pos += strlen (argv[i]);
+ fputs (argv[i], filelist_file);
+ fputc ('\n', filelist_file);
--j;
continue;
}
-#endif
}
-#if COMBINE_INPUTS
+ if (combine_inputs || indirect_files_count > 0)
+ arglist[j++] = "-ffilelist-file";
+
if (combine_inputs)
{
- combined_inputs_buffer[combined_inputs_pos] = '\0';
-#if 0
- if (! saw_C)
-#endif
- arglist[j++] = combined_inputs_buffer;
+ if (fclose (filelist_file))
+ pfatal_with_name (filelist_filename);
+ arglist[j++] = "-xjava";
+ arglist[j++] = filelist_filename;
}
-#endif
/* If we saw no -O or -g option, default to -g1, for javac compatibility. */
if (saw_g + saw_O == 0)
arglist[j++] = "-fsyntax-only";
arglist[j++] = "-femit-class-files";
arglist[j++] = "-S";
-#if COMBINE_INPUTS
arglist[j++] = "-o";
arglist[j++] = "NONE";
-#endif
}
+
+ if (shared_libgcc)
+ arglist[j++] = "-shared-libgcc";
arglist[j] = NULL;
}
int
-lang_specific_pre_link ()
+lang_specific_pre_link (void)
{
+ 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);
+ /* Append `main' to make the filename unique and allow
+
+ gcj --main=hello -save-temps hello.java
+
+ to work. jvgenmain needs to strip this `main' to arrive at the correct
+ class name. Append dummy `.c' that can be stripped by set_input so %b
+ is correct. */
+ set_input (concat (main_class_name, "main.c", NULL));
+ 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;
}
+
+/* Table of language-specific spec functions. */
+const struct spec_function lang_specific_spec_functions[] =
+{
+ { 0, 0 }
+};
OSDN Git Service
