diff options
Diffstat (limited to '4.0.3/gentoo/11_all_gcc4-java-rh163099.patch')
| -rw-r--r-- | 4.0.3/gentoo/11_all_gcc4-java-rh163099.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/4.0.3/gentoo/11_all_gcc4-java-rh163099.patch b/4.0.3/gentoo/11_all_gcc4-java-rh163099.patch new file mode 100644 index 0000000..7133fb6 --- /dev/null +++ b/4.0.3/gentoo/11_all_gcc4-java-rh163099.patch @@ -0,0 +1,58 @@ +2005-07-13 Tom Tromey <tromey@redhat.com> + + * jvspec.c (lang_specific_driver): Put filelist_filename first on + command line. + +--- gcc/java/jvspec.c 12 Jul 2005 22:35:48 -0000 1.72 ++++ gcc/java/jvspec.c 13 Jul 2005 15:21:33 -0000 +@@ -458,7 +458,7 @@ + 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 +@@ -493,11 +493,23 @@ + arglist = xmalloc ((num_args + 1) * sizeof (char *)); + 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"; ++ } ++ ++ 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 ((args[i] & RESOURCE_FILE_ARG) != 0) +@@ -559,15 +571,10 @@ + } + } + +- if (combine_inputs || indirect_files_count > 0) +- arglist[j++] = "-ffilelist-file"; +- + 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. */ |