X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fjavacomp.c;h=7a2b768809b58970f9117bf54f7639776673423e;hb=5d0b385594bc914e6233988bfb6bc1b92a2184b5;hp=859d0725b501d8663af35464a62ba8ebe20ee65b;hpb=18eedd96914ce2143792d1c98879ebbf8a369361;p=gnulib.git

diff --git a/lib/javacomp.c b/lib/javacomp.c
index 859d0725b..7a2b76880 100644
--- a/lib/javacomp.c
+++ b/lib/javacomp.c
@@ -1,5 +1,5 @@
 /* Compile a Java program.
-   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #include <alloca.h>
 
 /* Specification.  */
@@ -45,16 +43,21 @@
 #include "xalloc.h"
 #include "xallocsa.h"
 #include "getline.h"
-#include "pathname.h"
+#include "filename.h"
 #include "fwriteerror.h"
 #include "clean-temp.h"
 #include "error.h"
 #include "xvasprintf.h"
-#include "strstr.h"
+#include "c-strstr.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
 
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
+
 
 /* Survey of Java compilers.
 
@@ -281,6 +284,8 @@ static bool
 compile_using_gcj (const char * const *java_sources,
 		   unsigned int java_sources_count,
 		   bool no_assert_option,
+		   bool fsource_option, const char *source_version,
+		   bool ftarget_option, const char *target_version,
 		   const char *directory,
 		   bool optimize, bool debug,
 		   bool verbose, bool null_stderr)
@@ -289,11 +294,14 @@ compile_using_gcj (const char * const *java_sources,
   unsigned int argc;
   char **argv;
   char **argp;
+  char *fsource_arg;
+  char *ftarget_arg;
   int exitstatus;
   unsigned int i;
 
   argc =
-    2 + (no_assert_option ? 1 : 0) + (optimize ? 1 : 0) + (debug ? 1 : 0)
+    2 + (no_assert_option ? 1 : 0) + (fsource_option ? 1 : 0)
+    + (ftarget_option ? 1 : 0) + (optimize ? 1 : 0) + (debug ? 1 : 0)
     + (directory != NULL ? 2 : 0) + java_sources_count;
   argv = (char **) xallocsa ((argc + 1) * sizeof (char *));
 
@@ -302,6 +310,24 @@ compile_using_gcj (const char * const *java_sources,
   *argp++ = "-C";
   if (no_assert_option)
     *argp++ = "-fno-assert";
+  if (fsource_option)
+    {
+      fsource_arg = (char *) xallocsa (9 + strlen (source_version) + 1);
+      memcpy (fsource_arg, "-fsource=", 9);
+      strcpy (fsource_arg + 9, source_version);
+      *argp++ = fsource_arg;
+    }
+  else
+    fsource_arg = NULL;
+  if (ftarget_option)
+    {
+      ftarget_arg = (char *) xallocsa (9 + strlen (target_version) + 1);
+      memcpy (ftarget_arg, "-ftarget=", 9);
+      strcpy (ftarget_arg + 9, target_version);
+      *argp++ = ftarget_arg;
+    }
+  else
+    ftarget_arg = NULL;
   if (optimize)
     *argp++ = "-O";
   if (debug)
@@ -329,6 +355,10 @@ compile_using_gcj (const char * const *java_sources,
 			true, true);
   err = (exitstatus != 0);
 
+  if (ftarget_arg != NULL)
+    freesa (ftarget_arg);
+  if (fsource_arg != NULL)
+    freesa (fsource_arg);
   freesa (argv);
 
   return err;
@@ -469,7 +499,7 @@ write_temp_file (struct temp_dir *tmpdir, const char *file_name,
   FILE *fp;
 
   register_temp_file (tmpdir, file_name);
-  fp = fopen (file_name, "w");
+  fp = fopen_temp (file_name, "w");
   if (fp == NULL)
     {
       error (0, errno, _("failed to create \"%s\""), file_name);
@@ -477,7 +507,7 @@ write_temp_file (struct temp_dir *tmpdir, const char *file_name,
       return true;
     }
   fputs (contents, fp);
-  if (fwriteerror (fp))
+  if (fwriteerror_temp (fp))
     {
       error (0, errno, _("error while writing \"%s\" file"), file_name);
       return true;
@@ -570,7 +600,9 @@ is_envjavac_gcj (const char *javac)
 	  fclose (fp);
 	  goto failed;
 	}
-      envjavac_gcj = (strstr (line, "gcj") != NULL);
+      /* It is safe to call c_strstr() instead of strstr() here; see the
+	 comments in c-strstr.h.  */
+      envjavac_gcj = (c_strstr (line, "gcj") != NULL);
 
       fclose (fp);
 
@@ -588,11 +620,258 @@ is_envjavac_gcj (const char *javac)
   return envjavac_gcj;
 }
 
-/* Test whether $JAVAC, known to be a version of gcj, can be used for
+/* Return true if $JAVAC, known to be a version of gcj, is a version >= 4.3
+   of gcj.  */
+static bool
+is_envjavac_gcj43 (const char *javac)
+{
+  static bool envjavac_tested;
+  static bool envjavac_gcj43;
+
+  if (!envjavac_tested)
+    {
+      /* Test whether $JAVAC is gcj:
+	 "$JAVAC --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q \
+	  | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null"  */
+      unsigned int command_length;
+      char *command;
+      char *argv[4];
+      pid_t child;
+      int fd[1];
+      FILE *fp;
+      char *line;
+      size_t linesize;
+      size_t linelen;
+      int exitstatus;
+      char *p;
+
+      /* Setup the command "$JAVAC --version".  */
+      command_length = strlen (javac) + 1 + 9 + 1;
+      command = (char *) xallocsa (command_length);
+      p = command;
+      /* Don't shell_quote $JAVAC, because it may consist of a command
+	 and options.  */
+      memcpy (p, javac, strlen (javac));
+      p += strlen (javac);
+      memcpy (p, " --version", 1 + 9 + 1);
+      p += 1 + 9 + 1;
+      /* Ensure command_length was correctly calculated.  */
+      if (p - command > command_length)
+	abort ();
+
+      /* Call $JAVAC --version 2>/dev/null.  */
+      argv[0] = "/bin/sh";
+      argv[1] = "-c";
+      argv[2] = command;
+      argv[3] = NULL;
+      child = create_pipe_in (javac, "/bin/sh", argv, DEV_NULL, true, true,
+			      false, fd);
+      if (child == -1)
+	goto failed;
+
+      /* Retrieve its result.  */
+      fp = fdopen (fd[0], "r");
+      if (fp == NULL)
+	goto failed;
+
+      line = NULL; linesize = 0;
+      linelen = getline (&line, &linesize, fp);
+      if (linelen == (size_t)(-1))
+	{
+	  fclose (fp);
+	  goto failed;
+	}
+      p = line;
+      while (*p != '\0' && !(*p >= '0' && *p <= '9'))
+	p++;
+      envjavac_gcj43 =
+        !(*p == '4' && p[1] == '.' && p[2] >= '0' && p[2] <= '2')
+	&& (*p >= '4' && *p <= '9');
+
+      fclose (fp);
+
+      /* Remove zombie process from process list, and retrieve exit status.  */
+      exitstatus = wait_subprocess (child, javac, true, true, true, false);
+      if (exitstatus != 0)
+	envjavac_gcj43 = false;
+
+     failed:
+      freesa (command);
+
+      envjavac_tested = true;
+    }
+
+  return envjavac_gcj43;
+}
+
+/* Test whether $JAVAC, known to be a version of gcj >= 4.3, can be used, and
+   whether it needs a -fsource and/or -ftarget option.
+   Return a failure indicator (true upon error).  */
+static bool
+is_envjavac_gcj43_usable (const char *javac,
+			  const char *source_version,
+			  const char *target_version,
+			  bool *usablep,
+			  bool *fsource_option_p, bool *ftarget_option_p)
+{
+  /* The cache depends on the source_version and target_version.  */
+  struct result_t
+  {
+    bool tested;
+    bool usable;
+    bool fsource_option;
+    bool ftarget_option;
+  };
+  static struct result_t result_cache[SOURCE_VERSION_BOUND][TARGET_VERSION_BOUND];
+  struct result_t *resultp;
+
+  resultp = &result_cache[source_version_index (source_version)]
+			 [target_version_index (target_version)];
+  if (!resultp->tested)
+    {
+      /* Try $JAVAC.  */
+      struct temp_dir *tmpdir;
+      char *conftest_file_name;
+      char *compiled_file_name;
+      const char *java_sources[1];
+      struct stat statbuf;
+
+      tmpdir = create_temp_dir ("java", NULL, false);
+      if (tmpdir == NULL)
+	return true;
+
+      conftest_file_name =
+	concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
+      if (write_temp_file (tmpdir, conftest_file_name,
+			   get_goodcode_snippet (source_version)))
+	{
+	  free (conftest_file_name);
+	  cleanup_temp_dir (tmpdir);
+	  return true;
+	}
+
+      compiled_file_name =
+	concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
+      register_temp_file (tmpdir, compiled_file_name);
+
+      java_sources[0] = conftest_file_name;
+      if (!compile_using_envjavac (javac,
+				   java_sources, 1, tmpdir->dir_name,
+				   false, false, false, true)
+	  && stat (compiled_file_name, &statbuf) >= 0
+	  && get_classfile_version (compiled_file_name)
+	     <= corresponding_classfile_version (target_version))
+	{
+	  /* $JAVAC compiled conftest.java successfully.  */
+	  /* Try adding -fsource option if it is useful.  */
+	  char *javac_source =
+	    xasprintf ("%s -fsource=%s", javac, source_version);
+
+	  unlink (compiled_file_name);
+
+	  java_sources[0] = conftest_file_name;
+	  if (!compile_using_envjavac (javac_source,
+				       java_sources, 1, tmpdir->dir_name,
+				       false, false, false, true)
+	      && stat (compiled_file_name, &statbuf) >= 0
+	      && get_classfile_version (compiled_file_name)
+		 <= corresponding_classfile_version (target_version))
+	    {
+	      const char *failcode = get_failcode_snippet (source_version);
+
+	      if (failcode != NULL)
+		{
+		  free (compiled_file_name);
+		  free (conftest_file_name);
+
+		  conftest_file_name =
+		    concatenated_filename (tmpdir->dir_name,
+					   "conftestfail.java",
+					   NULL);
+		  if (write_temp_file (tmpdir, conftest_file_name, failcode))
+		    {
+		      free (conftest_file_name);
+		      free (javac_source);
+		      cleanup_temp_dir (tmpdir);
+		      return true;
+		    }
+
+		  compiled_file_name =
+		    concatenated_filename (tmpdir->dir_name,
+					   "conftestfail.class",
+					   NULL);
+		  register_temp_file (tmpdir, compiled_file_name);
+
+		  java_sources[0] = conftest_file_name;
+		  if (!compile_using_envjavac (javac,
+					       java_sources, 1,
+					       tmpdir->dir_name,
+					       false, false, false, true)
+		      && stat (compiled_file_name, &statbuf) >= 0)
+		    {
+		      unlink (compiled_file_name);
+
+		      java_sources[0] = conftest_file_name;
+		      if (compile_using_envjavac (javac_source,
+						  java_sources, 1,
+						  tmpdir->dir_name,
+						  false, false, false, true))
+			/* $JAVAC compiled conftestfail.java successfully, and
+			   "$JAVAC -fsource=$source_version" rejects it.  So
+			   the -fsource option is useful.  */
+			resultp->fsource_option = true;
+		    }
+		}
+	    }
+
+	  free (javac_source);
+
+	  resultp->usable = true;
+	}
+      else
+	{
+	  /* Try with -fsource and -ftarget options.  */
+	  char *javac_target =
+	    xasprintf ("%s -fsource=%s -ftarget=%s",
+		       javac, source_version, target_version);
+
+	  unlink (compiled_file_name);
+
+	  java_sources[0] = conftest_file_name;
+	  if (!compile_using_envjavac (javac_target,
+				       java_sources, 1, tmpdir->dir_name,
+				       false, false, false, true)
+	      && stat (compiled_file_name, &statbuf) >= 0
+	      && get_classfile_version (compiled_file_name)
+		 <= corresponding_classfile_version (target_version))
+	    {
+	      /* "$JAVAC -fsource $source_version -ftarget $target_version"
+		 compiled conftest.java successfully.  */
+	      resultp->fsource_option = true;
+	      resultp->ftarget_option = true;
+	      resultp->usable = true;
+	    }
+
+	  free (javac_target);
+	}
+
+      free (compiled_file_name);
+      free (conftest_file_name);
+
+      resultp->tested = true;
+    }
+
+  *usablep = resultp->usable;
+  *fsource_option_p = resultp->fsource_option;
+  *ftarget_option_p = resultp->ftarget_option;
+  return false;
+}
+
+/* Test whether $JAVAC, known to be a version of gcj < 4.3, can be used for
    compiling with target_version = 1.4 and source_version = 1.4.
    Return a failure indicator (true upon error).  */
 static bool
-is_envjavac_gcj_14_14_usable (const char *javac, bool *usablep)
+is_envjavac_oldgcj_14_14_usable (const char *javac, bool *usablep)
 {
   static bool envjavac_tested;
   static bool envjavac_usable;
@@ -611,7 +890,7 @@ is_envjavac_gcj_14_14_usable (const char *javac, bool *usablep)
 	return true;
 
       conftest_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.java", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
       if (write_temp_file (tmpdir, conftest_file_name,
 			   get_goodcode_snippet ("1.4")))
 	{
@@ -621,7 +900,7 @@ is_envjavac_gcj_14_14_usable (const char *javac, bool *usablep)
 	}
 
       compiled_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
       register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
@@ -643,12 +922,12 @@ is_envjavac_gcj_14_14_usable (const char *javac, bool *usablep)
   return false;
 }
 
-/* Test whether $JAVAC, known to be a version of gcj, can be used for
+/* Test whether $JAVAC, known to be a version of gcj < 4.3, can be used for
    compiling with target_version = 1.4 and source_version = 1.3.
    Return a failure indicator (true upon error).  */
 static bool
-is_envjavac_gcj_14_13_usable (const char *javac,
-			      bool *usablep, bool *need_no_assert_option_p)
+is_envjavac_oldgcj_14_13_usable (const char *javac,
+				 bool *usablep, bool *need_no_assert_option_p)
 {
   static bool envjavac_tested;
   static bool envjavac_usable;
@@ -672,7 +951,7 @@ is_envjavac_gcj_14_13_usable (const char *javac,
 	return true;
 
       conftest_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.java", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
       if (write_temp_file (tmpdir, conftest_file_name,
 			   get_goodcode_snippet ("1.3")))
 	{
@@ -682,7 +961,7 @@ is_envjavac_gcj_14_13_usable (const char *javac,
 	}
 
       compiled_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
       register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
@@ -715,7 +994,7 @@ is_envjavac_gcj_14_13_usable (const char *javac,
       if (javac_works && javac_noassert_works)
 	{
 	  conftest_file_name =
-	    concatenated_pathname (tmpdir->dir_name, "conftestfail.java",
+	    concatenated_filename (tmpdir->dir_name, "conftestfail.java",
 				   NULL);
 	  if (write_temp_file (tmpdir, conftest_file_name,
 			       get_failcode_snippet ("1.3")))
@@ -727,7 +1006,7 @@ is_envjavac_gcj_14_13_usable (const char *javac,
 	    }
 
 	  compiled_file_name =
-	    concatenated_pathname (tmpdir->dir_name, "conftestfail.class",
+	    concatenated_filename (tmpdir->dir_name, "conftestfail.class",
 				   NULL);
 	  register_temp_file (tmpdir, compiled_file_name);
 
@@ -812,7 +1091,7 @@ is_envjavac_nongcj_usable (const char *javac,
 	return true;
 
       conftest_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.java", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
       if (write_temp_file (tmpdir, conftest_file_name,
 			   get_goodcode_snippet (source_version)))
 	{
@@ -822,7 +1101,7 @@ is_envjavac_nongcj_usable (const char *javac,
 	}
 
       compiled_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
       register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
@@ -856,7 +1135,7 @@ is_envjavac_nongcj_usable (const char *javac,
 		  free (conftest_file_name);
 
 		  conftest_file_name =
-		    concatenated_pathname (tmpdir->dir_name,
+		    concatenated_filename (tmpdir->dir_name,
 					   "conftestfail.java",
 					   NULL);
 		  if (write_temp_file (tmpdir, conftest_file_name, failcode))
@@ -868,7 +1147,7 @@ is_envjavac_nongcj_usable (const char *javac,
 		    }
 
 		  compiled_file_name =
-		    concatenated_pathname (tmpdir->dir_name,
+		    concatenated_filename (tmpdir->dir_name,
 					   "conftestfail.class",
 					   NULL);
 		  register_temp_file (tmpdir, compiled_file_name);
@@ -940,7 +1219,7 @@ is_envjavac_nongcj_usable (const char *javac,
 		      free (conftest_file_name);
 
 		      conftest_file_name =
-			concatenated_pathname (tmpdir->dir_name,
+			concatenated_filename (tmpdir->dir_name,
 					       "conftestfail.java",
 					       NULL);
 		      if (write_temp_file (tmpdir, conftest_file_name,
@@ -954,7 +1233,7 @@ is_envjavac_nongcj_usable (const char *javac,
 			}
 
 		      compiled_file_name =
-			concatenated_pathname (tmpdir->dir_name,
+			concatenated_filename (tmpdir->dir_name,
 					       "conftestfail.class",
 					       NULL);
 		      register_temp_file (tmpdir, compiled_file_name);
@@ -1108,7 +1387,7 @@ is_gcj_present (void)
 	      char *conftest_file_name;
 
 	      conftest_file_name =
-		concatenated_pathname (tmpdir->dir_name, "conftestlib.java",
+		concatenated_filename (tmpdir->dir_name, "conftestlib.java",
 				       NULL);
 	      if (write_temp_file (tmpdir, conftest_file_name,
 "public class conftestlib {\n"
@@ -1122,13 +1401,14 @@ is_gcj_present (void)
 		  const char *java_sources[1];
 
 		  compiled_file_name =
-		    concatenated_pathname (tmpdir->dir_name,
+		    concatenated_filename (tmpdir->dir_name,
 					   "conftestlib.class",
 					   NULL);
 		  register_temp_file (tmpdir, compiled_file_name);
 
 		  java_sources[0] = conftest_file_name;
 		  if (compile_using_gcj (java_sources, 1, false,
+					 false, NULL, false, NULL,
 					 tmpdir->dir_name,
 					 false, false, false, true))
 		    gcj_present = false;
@@ -1146,11 +1426,232 @@ is_gcj_present (void)
   return gcj_present;
 }
 
-/* Test gcj can be used for compiling with target_version = 1.4 and
-   source_version = 1.4.
+static bool
+is_gcj_43 (void)
+{
+  static bool gcj_tested;
+  static bool gcj_43;
+
+  if (!gcj_tested)
+    {
+      /* Test for presence of gcj:
+	 "gcj --version 2> /dev/null | \
+	  sed -e 's,^[^0-9]*,,' -e 1q | \
+	  sed -e '/^4\.[012]/d' | grep '^[4-9]'"  */
+      char *argv[3];
+      pid_t child;
+      int fd[1];
+      int exitstatus;
+
+      argv[0] = "gcj";
+      argv[1] = "--version";
+      argv[2] = NULL;
+      child = create_pipe_in ("gcj", "gcj", argv, DEV_NULL, true, true,
+			      false, fd);
+      gcj_43 = false;
+      if (child != -1)
+	{
+	  /* Read the subprocess output, drop all lines except the first,
+	     drop all characters before the first digit, and test whether
+	     the remaining string starts with a digit >= 4, but not with
+	     "4.0" or "4.1" or "4.2".  */
+	  char c[3];
+	  size_t count = 0;
+
+	  while (safe_read (fd[0], &c[count], 1) > 0)
+	    {
+	      if (c[count] == '\n')
+		break;
+	      if (count == 0)
+		{
+		  if (!(c[0] >= '0' && c[0] <= '9'))
+		    continue;
+		  gcj_43 = (c[0] >= '4');
+		}
+	      count++;
+	      if (count == 3)
+		{
+		  if (c[0] == '4' && c[1] == '.' && c[2] >= '0' && c[2] <= '2')
+		    gcj_43 = false;
+		  break;
+		}
+	    }
+	  while (safe_read (fd[0], &c[0], 1) > 0)
+	    ;
+
+	  close (fd[0]);
+
+	  /* Remove zombie process from process list, and retrieve exit
+	     status.  */
+	  exitstatus =
+	    wait_subprocess (child, "gcj", false, true, true, false);
+	  if (exitstatus != 0)
+	    gcj_43 = false;
+	}
+
+      gcj_tested = true;
+    }
+
+  return gcj_43;
+}
+
+/* Test whether gcj >= 4.3 can be used, and whether it needs a -fsource and/or
+   -ftarget option.
+   Return a failure indicator (true upon error).  */
+static bool
+is_gcj43_usable (const char *source_version,
+		 const char *target_version,
+		 bool *usablep,
+		 bool *fsource_option_p, bool *ftarget_option_p)
+{
+  /* The cache depends on the source_version and target_version.  */
+  struct result_t
+  {
+    bool tested;
+    bool usable;
+    bool fsource_option;
+    bool ftarget_option;
+  };
+  static struct result_t result_cache[SOURCE_VERSION_BOUND][TARGET_VERSION_BOUND];
+  struct result_t *resultp;
+
+  resultp = &result_cache[source_version_index (source_version)]
+			 [target_version_index (target_version)];
+  if (!resultp->tested)
+    {
+      /* Try gcj.  */
+      struct temp_dir *tmpdir;
+      char *conftest_file_name;
+      char *compiled_file_name;
+      const char *java_sources[1];
+      struct stat statbuf;
+
+      tmpdir = create_temp_dir ("java", NULL, false);
+      if (tmpdir == NULL)
+	return true;
+
+      conftest_file_name =
+	concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
+      if (write_temp_file (tmpdir, conftest_file_name,
+			   get_goodcode_snippet (source_version)))
+	{
+	  free (conftest_file_name);
+	  cleanup_temp_dir (tmpdir);
+	  return true;
+	}
+
+      compiled_file_name =
+	concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
+      register_temp_file (tmpdir, compiled_file_name);
+
+      java_sources[0] = conftest_file_name;
+      if (!compile_using_gcj (java_sources, 1, false, false, NULL, false, NULL,
+			      tmpdir->dir_name, false, false, false, true)
+	  && stat (compiled_file_name, &statbuf) >= 0
+	  && get_classfile_version (compiled_file_name)
+	     <= corresponding_classfile_version (target_version))
+	{
+	  /* gcj compiled conftest.java successfully.  */
+	  /* Try adding -fsource option if it is useful.  */
+	  unlink (compiled_file_name);
+
+	  java_sources[0] = conftest_file_name;
+	  if (!compile_using_gcj (java_sources, 1,
+				  false, true, source_version, false, NULL,
+				  tmpdir->dir_name, false, false, false, true)
+	      && stat (compiled_file_name, &statbuf) >= 0
+	      && get_classfile_version (compiled_file_name)
+		 <= corresponding_classfile_version (target_version))
+	    {
+	      const char *failcode = get_failcode_snippet (source_version);
+
+	      if (failcode != NULL)
+		{
+		  free (compiled_file_name);
+		  free (conftest_file_name);
+
+		  conftest_file_name =
+		    concatenated_filename (tmpdir->dir_name,
+					   "conftestfail.java",
+					   NULL);
+		  if (write_temp_file (tmpdir, conftest_file_name, failcode))
+		    {
+		      free (conftest_file_name);
+		      cleanup_temp_dir (tmpdir);
+		      return true;
+		    }
+
+		  compiled_file_name =
+		    concatenated_filename (tmpdir->dir_name,
+					   "conftestfail.class",
+					   NULL);
+		  register_temp_file (tmpdir, compiled_file_name);
+
+		  java_sources[0] = conftest_file_name;
+		  if (!compile_using_gcj (java_sources, 1,
+					  false, false, NULL, false, NULL,
+					  tmpdir->dir_name,
+					  false, false, false, true)
+		      && stat (compiled_file_name, &statbuf) >= 0)
+		    {
+		      unlink (compiled_file_name);
+
+		      java_sources[0] = conftest_file_name;
+		      if (compile_using_gcj (java_sources, 1,
+					     false, true, source_version,
+					     false, NULL,
+					     tmpdir->dir_name,
+					     false, false, false, true))
+			/* gcj compiled conftestfail.java successfully, and
+			   "gcj -fsource=$source_version" rejects it.  So
+			   the -fsource option is useful.  */
+			resultp->fsource_option = true;
+		    }
+		}
+	    }
+
+	  resultp->usable = true;
+	}
+      else
+	{
+	  /* Try with -fsource and -ftarget options.  */
+	  unlink (compiled_file_name);
+
+	  java_sources[0] = conftest_file_name;
+	  if (!compile_using_gcj (java_sources, 1,
+				  false, true, source_version,
+				  true, target_version,
+				  tmpdir->dir_name,
+				  false, false, false, true)
+	      && stat (compiled_file_name, &statbuf) >= 0
+	      && get_classfile_version (compiled_file_name)
+		 <= corresponding_classfile_version (target_version))
+	    {
+	      /* "gcj -fsource $source_version -ftarget $target_version"
+		 compiled conftest.java successfully.  */
+	      resultp->fsource_option = true;
+	      resultp->ftarget_option = true;
+	      resultp->usable = true;
+	    }
+	}
+
+      free (compiled_file_name);
+      free (conftest_file_name);
+
+      resultp->tested = true;
+    }
+
+  *usablep = resultp->usable;
+  *fsource_option_p = resultp->fsource_option;
+  *ftarget_option_p = resultp->ftarget_option;
+  return false;
+}
+
+/* Test whether gcj < 4.3 can be used for compiling with target_version = 1.4
+   and source_version = 1.4.
    Return a failure indicator (true upon error).  */
 static bool
-is_gcj_14_14_usable (bool *usablep)
+is_oldgcj_14_14_usable (bool *usablep)
 {
   static bool gcj_tested;
   static bool gcj_usable;
@@ -1169,7 +1670,7 @@ is_gcj_14_14_usable (bool *usablep)
 	return true;
 
       conftest_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.java", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
       if (write_temp_file (tmpdir, conftest_file_name,
 			   get_goodcode_snippet ("1.4")))
 	{
@@ -1179,12 +1680,12 @@ is_gcj_14_14_usable (bool *usablep)
 	}
 
       compiled_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
       register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
-      if (!compile_using_gcj (java_sources, 1, false, tmpdir->dir_name,
-			      false, false, false, true)
+      if (!compile_using_gcj (java_sources, 1, false, false, NULL, false, NULL,
+			      tmpdir->dir_name, false, false, false, true)
 	  && stat (compiled_file_name, &statbuf) >= 0)
 	/* Compilation succeeded.  */
 	gcj_usable = true;
@@ -1201,11 +1702,11 @@ is_gcj_14_14_usable (bool *usablep)
   return false;
 }
 
-/* Test whether gcj can be used for compiling with target_version = 1.4 and
-   source_version = 1.3.
+/* Test whether gcj < 4.3 can be used for compiling with target_version = 1.4
+   and source_version = 1.3.
    Return a failure indicator (true upon error).  */
 static bool
-is_gcj_14_13_usable (bool *usablep, bool *need_no_assert_option_p)
+is_oldgcj_14_13_usable (bool *usablep, bool *need_no_assert_option_p)
 {
   static bool gcj_tested;
   static bool gcj_usable;
@@ -1226,7 +1727,7 @@ is_gcj_14_13_usable (bool *usablep, bool *need_no_assert_option_p)
 	return true;
 
       conftest_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.java", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
       if (write_temp_file (tmpdir, conftest_file_name,
 			   get_goodcode_snippet ("1.3")))
 	{
@@ -1236,12 +1737,12 @@ is_gcj_14_13_usable (bool *usablep, bool *need_no_assert_option_p)
 	}
 
       compiled_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
       register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
-      if (!compile_using_gcj (java_sources, 1, true, tmpdir->dir_name,
-			      false, false, false, true)
+      if (!compile_using_gcj (java_sources, 1, true, false, NULL, false, NULL,
+			      tmpdir->dir_name, false, false, false, true)
 	  && stat (compiled_file_name, &statbuf) >= 0)
 	/* Compilation succeeded.  */
 	{
@@ -1253,8 +1754,9 @@ is_gcj_14_13_usable (bool *usablep, bool *need_no_assert_option_p)
 	  unlink (compiled_file_name);
 
 	  java_sources[0] = conftest_file_name;
-	  if (!compile_using_gcj (java_sources, 1, false, tmpdir->dir_name,
-				  false, false, false, true)
+	  if (!compile_using_gcj (java_sources, 1, false,
+				  false, NULL, false, NULL,
+				  tmpdir->dir_name, false, false, false, true)
 	      && stat (compiled_file_name, &statbuf) >= 0)
 	    /* Compilation succeeded.  */
 	    {
@@ -1333,7 +1835,7 @@ is_javac_usable (const char *source_version, const char *target_version,
 	return true;
 
       conftest_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.java", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
       if (write_temp_file (tmpdir, conftest_file_name,
 			   get_goodcode_snippet (source_version)))
 	{
@@ -1343,7 +1845,7 @@ is_javac_usable (const char *source_version, const char *target_version,
 	}
 
       compiled_file_name =
-	concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
+	concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
       register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
@@ -1376,7 +1878,7 @@ is_javac_usable (const char *source_version, const char *target_version,
 		  free (conftest_file_name);
 
 		  conftest_file_name =
-		    concatenated_pathname (tmpdir->dir_name,
+		    concatenated_filename (tmpdir->dir_name,
 					   "conftestfail.java",
 					   NULL);
 		  if (write_temp_file (tmpdir, conftest_file_name, failcode))
@@ -1387,7 +1889,7 @@ is_javac_usable (const char *source_version, const char *target_version,
 		    }
 
 		  compiled_file_name =
-		    concatenated_pathname (tmpdir->dir_name,
+		    concatenated_filename (tmpdir->dir_name,
 					   "conftestfail.class",
 					   NULL);
 		  register_temp_file (tmpdir, compiled_file_name);
@@ -1457,7 +1959,7 @@ is_javac_usable (const char *source_version, const char *target_version,
 		      free (conftest_file_name);
 
 		      conftest_file_name =
-			concatenated_pathname (tmpdir->dir_name,
+			concatenated_filename (tmpdir->dir_name,
 					       "conftestfail.java",
 					       NULL);
 		      if (write_temp_file (tmpdir, conftest_file_name,
@@ -1469,7 +1971,7 @@ is_javac_usable (const char *source_version, const char *target_version,
 			}
 
 		      compiled_file_name =
-			concatenated_pathname (tmpdir->dir_name,
+			concatenated_filename (tmpdir->dir_name,
 					       "conftestfail.class",
 					       NULL);
 		      register_temp_file (tmpdir, compiled_file_name);
@@ -1588,31 +2090,51 @@ compile_java_class (const char * const *java_sources,
 	bool no_assert_option = false;
 	bool source_option = false;
 	bool target_option = false;
+	bool fsource_option = false;
+	bool ftarget_option = false;
 
 	if (target_version == NULL)
 	  target_version = default_target_version ();
 
 	if (is_envjavac_gcj (javac))
 	  {
-	    /* It's a version of gcj.  Ignore the version of the class files
-	       that it creates.  */
-	    if (strcmp (target_version, "1.4") == 0
-		&& strcmp (source_version, "1.4") == 0)
+	    /* It's a version of gcj.  */
+	    if (is_envjavac_gcj43 (javac))
 	      {
-		if (is_envjavac_gcj_14_14_usable (javac, &usable))
+		/* It's a version of gcj >= 4.3.  Assume the classfile versions
+		   are correct.  */
+		if (is_envjavac_gcj43_usable (javac,
+					      source_version, target_version,
+					      &usable,
+					      &fsource_option, &ftarget_option))
 		  {
 		    err = true;
 		    goto done1;
 		  }
 	      }
-	    else if (strcmp (target_version, "1.4") == 0
-		     && strcmp (source_version, "1.3") == 0)
+	    else
 	      {
-		if (is_envjavac_gcj_14_13_usable (javac,
-						  &usable, &no_assert_option))
+		/* It's a version of gcj < 4.3.  Ignore the version of the
+		   class files that it creates.  */
+		if (strcmp (target_version, "1.4") == 0
+		    && strcmp (source_version, "1.4") == 0)
 		  {
-		    err = true;
-		    goto done1;
+		    if (is_envjavac_oldgcj_14_14_usable (javac, &usable))
+		      {
+			err = true;
+			goto done1;
+		      }
+		  }
+		else if (strcmp (target_version, "1.4") == 0
+			 && strcmp (source_version, "1.3") == 0)
+		  {
+		    if (is_envjavac_oldgcj_14_13_usable (javac,
+							 &usable,
+							 &no_assert_option))
+		      {
+			err = true;
+			goto done1;
+		      }
 		  }
 	      }
 	  }
@@ -1641,12 +2163,16 @@ compile_java_class (const char * const *java_sources,
 	    javac_with_options =
 	      (no_assert_option
 	       ? xasprintf ("%s -fno-assert", javac)
-	       : xasprintf ("%s%s%s%s%s",
+	       : xasprintf ("%s%s%s%s%s%s%s%s%s",
 			    javac,
 			    source_option ? " -source " : "",
 			    source_option ? source_version : "",
 			    target_option ? " -target " : "",
-			    target_option ? target_version : ""));
+			    target_option ? target_version : "",
+			    fsource_option ? " -fsource=" : "",
+			    fsource_option ? source_version : "",
+			    ftarget_option ? " -ftarget=" : "",
+			    ftarget_option ? target_version : ""));
 
 	    err = compile_using_envjavac (javac_with_options,
 					  java_sources, java_sources_count,
@@ -1673,31 +2199,49 @@ compile_java_class (const char * const *java_sources,
 
   if (is_gcj_present ())
     {
-      /* Test whether it supports the desired target-version and
-	 source-version.  But ignore the version of the class files that
-	 it creates.  */
+      /* It's a version of gcj.  */
       bool usable = false;
       bool no_assert_option = false;
+      bool fsource_option = false;
+      bool ftarget_option = false;
 
       if (target_version == NULL)
 	target_version = default_target_version ();
 
-      if (strcmp (target_version, "1.4") == 0
-	  && strcmp (source_version, "1.4") == 0)
+      if (is_gcj_43 ())
 	{
-	  if (is_gcj_14_14_usable (&usable))
+	  /* It's a version of gcj >= 4.3.  Assume the classfile versions
+	     are correct.  */
+	  if (is_gcj43_usable (source_version, target_version,
+			       &usable, &fsource_option, &ftarget_option))
 	    {
 	      err = true;
 	      goto done1;
 	    }
 	}
-      else if (strcmp (target_version, "1.4") == 0
-	       && strcmp (source_version, "1.3") == 0)
+      else
 	{
-	  if (is_gcj_14_13_usable (&usable, &no_assert_option))
+	  /* It's a version of gcj < 4.3.  Ignore the version of the class
+	     files that it creates.
+	     Test whether it supports the desired target-version and
+	     source-version.  */
+	  if (strcmp (target_version, "1.4") == 0
+	      && strcmp (source_version, "1.4") == 0)
 	    {
-	      err = true;
-	      goto done1;
+	      if (is_oldgcj_14_14_usable (&usable))
+		{
+		  err = true;
+		  goto done1;
+		}
+	    }
+	  else if (strcmp (target_version, "1.4") == 0
+		   && strcmp (source_version, "1.3") == 0)
+	    {
+	      if (is_oldgcj_14_13_usable (&usable, &no_assert_option))
+		{
+		  err = true;
+		  goto done1;
+		}
 	    }
 	}
 
@@ -1715,6 +2259,8 @@ compile_java_class (const char * const *java_sources,
 
 	  err = compile_using_gcj (java_sources, java_sources_count,
 				   no_assert_option,
+				   fsource_option, source_version,
+				   ftarget_option, target_version,
 				   directory, optimize, debug, verbose, false);
 
 	  /* Reset CLASSPATH.  */