Merge basic-improvements-branch to trunk

From-SVN: r60174

1 files changed, 18 insertions, 23 deletions

diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c
index c3efe58..aee48c8 100644
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
@@ -25,6 +25,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "gcc.h"
 
 /* Name of spec file.  */
@@ -55,28 +57,28 @@ int lang_specific_extra_outfiles = 0;
 int shared_libgcc = 1;
 
 static const char jvgenmain_spec[] =
-  "jvgenmain %{D*} %b %{!pipe:%u.i} |\n\
-   cc1 %{!pipe:%U.i} %1 \
+  "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}\
-                   %{<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}\
+		   %<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:%g.s}} |\n\
-              %{!S:as %a %Y -o %d%w%u%O %{!pipe:%g.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.  */
@@ -161,9 +163,6 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
      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;
@@ -384,7 +383,6 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
 	  if (saw_resource)
 	    {
 	      args[i] |= RESOURCE_FILE_ARG;
-	      last_input_index = i;
 	      added += 2;  /* for -xjava and -xnone */
 	    }
 
@@ -400,13 +398,11 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
 	    {
 	      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
@@ -414,7 +410,6 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
 	    {
 	      args[i] |= ZIP_FILE_ARG;
 	      zip_files_count++;
-	      last_input_index = i;
 	    }
 	}
     }