2004-08-09 H.J. Lu <hongjiu.lu@intel.com>

[pf3gnuchains/gcc-fork.git] / gcc / java / jvspec.c

diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c
index a178653..83bf281 100644 (file)
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
@@ -48,8 +48,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 /* True if this arg is a resource file.  */
 #define RESOURCE_FILE_ARG (1<<7)
 
-static char *find_spec_file    PARAMS ((const char *));
-static int verify_class_name    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;
@@ -64,7 +64,7 @@ static const char jvgenmain_spec[] =
                   %{g*} %{O*} \
                   %{v:-version} %{pg:-p} %{p}\
                   %<fbounds-check %<fno-bounds-check\
-                  %<fassume-compiled %<fno-assume-compiled\
+                  %<fassume-compiled* %<fno-assume-compiled*\
                   %<fcompile-resource* %<fassert %<fno-assert \
                   %<femit-class-file %<femit-class-files %<fencoding*\
                   %<fuse-boehm-gc %<fhash-synchronization %<fjni\
@@ -84,8 +84,7 @@ static const char jvgenmain_spec[] =
 /* 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;
@@ -116,8 +115,7 @@ find_spec_file (dir)
 /* Verify that NAME is a valid Java class name that might contain
    `main'.  Return 0 on failure.  */
 static int
-verify_class_name (name)
-     const char *name;
+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.  */
@@ -144,10 +142,8 @@ verify_class_name (name)
 }
 
 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;
 
@@ -319,7 +315,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
          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)
@@ -337,7 +333,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
            }
          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
@@ -600,7 +596,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
 }
 
 int
-lang_specific_pre_link ()
+lang_specific_pre_link (void)
 {
   int err;
   if (main_class_name == NULL)