- /* 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, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007 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)
+the Free Software Foundation; either version 3, 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
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with GCC; see the file COPYING3. If not see
+<http://www.gnu.org/licenses/>.
Java and all Java-based marks are trademarks or registered trademarks
of Sun Microsystems, Inc. in the United States and other countries.
#include "config.h"
#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
#include "gcc.h"
+#include "jcf.h"
/* Name of spec file. */
#define SPEC_FILE "libgcj.spec"
#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;
/* 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 %{findirect-dispatch} %{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}\
- %{<fcheck-references} %{<fno-check-references}\
- %{<ffilelist-file}\
+ %<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 %<fnew-verifier\
+ %<fno-store-check %<foutput-class-dir\
+ %<fclasspath* %<fCLASSPATH* %<fbootclasspath*\
+ %<fextdirs*\
+ %<fuse-divide-subroutine %<fno-use-divide-subroutine\
+ %<fcheck-references %<fno-check-references\
+ %<ffilelist-file %<fsaw-java-file %<fsource* %<ftarget*\
%{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 = XNEWVEC (char, strlen (dir) + sizeof (SPEC_FILE)
+ + sizeof ("-specs=") + 4);
strcpy (spec, "-specs=");
x = strlen (spec);
strcat (spec, dir);
return NULL;
}
+#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;
should be passed to a single jc1 invocation. */
int combine_inputs = 0;
- /* Index of last .java or .class argument. */
- int last_input_index;
-
/* Number of .java and .class source file arguments seen. */
int java_files_count = 0;
int class_files_count = 0;
/* 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;
-
- /* "-lc" if it appears on the command line. */
- const char *saw_libc ATTRIBUTE_UNUSED = 0;
-
- /* "-lgcjgc" if it appears on the command line. */
- const char *saw_gc ATTRIBUTE_UNUSED = 0;
-
- /* Saw `-l' option for the thread library. */
- const char *saw_threadlib 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. */
char *spec_file = NULL;
+ /* If linking, nonzero if the BC-ABI is in use. */
+ int link_for_bc_abi = 0;
+
argc = *in_argc;
argv = *in_argv;
added_libraries = *in_added_libraries;
- args = (int *) xcalloc (argc, sizeof (int));
+ args = XCNEWVEC (int, argc);
for (i = 1; i < argc; i++)
{
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 ("bBVDUoeTuIYmLiAI", 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
else if (strcmp (argv[i], "-fsyntax-only") == 0
|| strcmp (argv[i], "--syntax-only") == 0)
{
- want_spec_file = 0;
library = 0;
will_link = 0;
continue;
else if (strcmp (argv[i], "-static-libgcc") == 0
|| strcmp (argv[i], "-static") == 0)
shared_libgcc = 0;
+ else if (strcmp (argv[i], "-findirect-dispatch") == 0
+ || strcmp (argv[i], "--indirect-dispatch") == 0)
+ {
+ link_for_bc_abi = 1;
+ }
else
/* Pass other options through. */
continue;
continue;
}
+ if (saw_resource)
+ {
+ args[i] |= RESOURCE_FILE_ARG;
+ added += 2; /* for -xjava and -xnone */
+ }
+
if (argv[i][0] == '@')
{
args[i] |= INDIRECT_FILE_ARG;
{
args[i] |= JAVA_FILE_ARG;
java_files_count++;
- last_input_index = i;
}
if (len > 6 && strcmp (argv[i] + len - 6, ".class") == 0)
{
args[i] |= CLASS_FILE_ARG;
class_files_count++;
- last_input_index = i;
}
if (len > 4
&& (strcmp (argv[i] + len - 4, ".zip") == 0
{
args[i] |= ZIP_FILE_ARG;
zip_files_count++;
- last_input_index = i;
}
}
}
if (quote)
- fatal ("argument to `%s' missing\n", quote);
+ fatal ("argument to '%s' missing\n", quote);
if (saw_D && ! main_class_name)
- fatal ("can't specify `-D' without `--main'\n");
+ 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 (class_files_count + zip_files_count > 0)
{
- error ("Warning: already-compiled .class files ignored with -C");
+ 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;
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" */
+ num_args += 3; /* for the combined arg "-xjava", and "-xnone" */
}
- /* If we know we don't have to do anything, bail now. */
-#if 0
- if (! added && ! library && main_class_name == NULL && ! saw_C)
- {
- free (args);
- return;
- }
-#endif
if (main_class_name)
{
if (saw_g + saw_O == 0)
num_args++;
num_args++;
+ /* An additional entry for the classpath. */
+ num_args++;
if (combine_inputs || indirect_files_count > 0)
num_args += 1; /* for "-ffilelist-file" */
shared_libgcc = 0;
#endif
+ if (java_files_count > 0)
+ ++num_args;
+
num_args += shared_libgcc;
- arglist = (const char **) xmalloc ((num_args + 1) * sizeof (char *));
+ num_args += link_for_bc_abi;
+
+ arglist = XNEWVEC (const char *, num_args + 1);
j = 0;
- for (i = 0; i < argc; i++, j++)
+ arglist[j++] = argv[0];
+
+ if (combine_inputs || indirect_files_count > 0)
+ arglist[j++] = "-ffilelist-file";
+
+ if (combine_inputs)
+ {
+ arglist[j++] = "-xjava";
+ arglist[j++] = filelist_filename;
+ arglist[j++] = "-xnone";
+ }
+
+ if (java_files_count > 0)
+ arglist[j++] = "-fsaw-java-file";
+
+ jcf_path_init ();
+ for (i = 1; i < argc; i++, j++)
{
arglist[j] = argv[i];
- if ((args[i] & PARAM_ARG) || i == 0)
+ if ((args[i] & PARAM_ARG))
continue;
- if (strcmp (argv[i], "-classpath") == 0
- || strcmp (argv[i], "-CLASSPATH") == 0)
+ if ((args[i] & RESOURCE_FILE_ARG) != 0)
+ {
+ arglist[j++] = "-xjava";
+ arglist[j++] = argv[i];
+ arglist[j] = "-xnone";
+ }
+
+ if (argv[i][0] == '-' && argv[i][1] == 'I')
+ {
+ const char *arg;
+ if (argv[i][2] == '\0')
+ {
+ gcc_assert (i + 1 < argc && (args[i + 1] & PARAM_ARG) != 0);
+ arg = argv[i + 1];
+ /* Drop the argument. */
+ ++i;
+ }
+ else
+ arg = &argv[i][2];
+ jcf_path_include_arg (arg);
+ --j;
+ continue;
+ }
+ if (! strcmp (argv[i], "-classpath")
+ || ! strcmp (argv[i], "-CLASSPATH"))
+ {
+ jcf_path_classpath_arg (argv[i + 1]);
+ ++i;
+ --j;
+ continue;
+ }
+ if (! strcmp (argv[i], "-bootclasspath"))
+ {
+ jcf_path_bootclasspath_arg (argv[i + 1]);
+ ++i;
+ --j;
+ continue;
+ }
+ if (! strncmp (argv[i], "-fCLASSPATH=", 12)
+ || ! strncmp (argv[i], "-fclasspath=", 12))
+ {
+ char *p = strchr (argv[i], '=');
+ jcf_path_classpath_arg (p + 1);
+ --j;
+ continue;
+ }
+ if (! strncmp (argv[i], "-fbootclasspath=", 16))
+ {
+ char *p = strchr (argv[i], '=');
+ jcf_path_bootclasspath_arg (p + 1);
+ --j;
+ continue;
+ }
+ if (! strcmp (argv[i], "-extdirs"))
+ {
+ jcf_path_extdirs_arg (argv[i + 1]);
+ ++i;
+ --j;
+ continue;
+ }
+
+ if (strcmp (argv[i], "-encoding") == 0)
{
arglist[j] = concat ("-f", argv[i]+1, "=", argv[i+1], NULL);
i++;
if (strncmp (argv[i], "-fmain=", 7) == 0)
{
if (! will_link)
- fatal ("cannot specify `main' class when not linking");
+ fatal ("cannot specify 'main' class when not linking");
--j;
continue;
}
}
}
- if (combine_inputs || indirect_files_count > 0)
- arglist[j++] = "-ffilelist-file";
+ /* Handle classpath setting. We specify the bootclasspath since
+ that requires the fewest changes to our existing code... */
+ jcf_path_seal (0);
+ arglist[j++] = jcf_path_compute ("-fbootclasspath=");
if (combine_inputs)
{
if (fclose (filelist_file))
pfatal_with_name (filelist_filename);
- arglist[j++] = "-xjava";
- arglist[j++] = filelist_filename;
}
/* If we saw no -O or -g option, default to -g1, for javac compatibility. */
if (shared_libgcc)
arglist[j++] = "-shared-libgcc";
+ if (link_for_bc_abi)
+ arglist[j++] = "-s-bc-abi";
+
arglist[j] = NULL;
*in_argc = j;
}
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);
+ /* 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)
{
OSDN Git Service
