diff -x de.gmo -x fr.gmo -Nrc3p gcc-2.95.1/gcc/java/ChangeLog gcc-2.95.2/gcc/java/ChangeLog
*** gcc-2.95.1/gcc/java/ChangeLog	Mon Aug 16 01:29:49 1999
--- gcc-2.95.2/gcc/java/ChangeLog	Sun Oct 24 23:59:13 1999
***************
*** 1,3 ****
--- 1,12 ----
+ Sun Oct 24 23:54:10 PDT 1999 Jeff Law  (law@cygnus.com)
+ 
+ 	* gcc-2.95.2 Released.
+ 
+ Sat Oct 16 15:18:42 1999  Jeffrey A Law  (law@cygnus.com)
+ 
+ 	1999-10-14  Tom Tromey  <tromey@cygnus.com>
+ 	* jvspec.c (jvgenmain_spec): Use `%umain', not just `%u'.
+ 
  Mon Aug 16 01:29:24 PDT 1999 Jeff Law  (law@cygnus.com)
  
  	* gcc-2.95.1 Released.
diff -x de.gmo -x fr.gmo -Nrc3p gcc-2.95.1/gcc/java/jvspec.c gcc-2.95.2/gcc/java/jvspec.c
*** gcc-2.95.1/gcc/java/jvspec.c	Mon Jun 28 19:09:48 1999
--- gcc-2.95.2/gcc/java/jvspec.c	Sat Oct 16 14:18:28 1999
*************** int lang_specific_extra_outfiles = 0;
*** 54,68 ****
  #define COMBINE_INPUTS 0
  
  char jvgenmain_spec[] =
!   "jvgenmain %i %{!pipe:%u.i} |\n\
!    cc1 %{!pipe:%U.i} %1 \
  		   %{!Q:-quiet} -dumpbase %b.c %{d*} %{m*} %{a*}\
  		   %{g*} %{O*} \
  		   %{v:-version} %{pg:-p} %{p} %{f*}\
  		   %{aux-info*}\
  		   %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
! 		   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%U.s}} |\n\
!               %{!S:as %a %Y -o %d%w%u%O %{!pipe:%U.s} %A\n }";
  
  /* Return full path name of spec file if it is in DIR, or NULL if
     not.  */
--- 54,68 ----
  #define COMBINE_INPUTS 0
  
  char jvgenmain_spec[] =
!   "jvgenmain %i %{!pipe:%umain.i} |\n\
!    cc1 %{!pipe:%Umain.i} %1 \
  		   %{!Q:-quiet} -dumpbase %b.c %{d*} %{m*} %{a*}\
  		   %{g*} %{O*} \
  		   %{v:-version} %{pg:-p} %{p} %{f*}\
  		   %{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 }";
  
  /* Return full path name of spec file if it is in DIR, or NULL if
     not.  */