Partial merger from CVS-HEAD.

contrib/crossrpms/gcc/build.add

@@ -19,9 +19,6 @@
 %if %build_gnat
   languages="$languages,ada"
 %endif
-%if %build_libgcj
-  optargs="--enable-libgcj"
-%endif
 %if "%{_prefix}" != "/usr"
   export PATH="%{_bindir}:${PATH}"
 %endif
@@ -58,7 +55,10 @@
 %if %build_newlib
     --enable-newlib-io-c99-formats \
 %endif
-    --enable-languages="$languages" $optargs
+%if %build_libgcj
+    --enable-libgcj \
+%endif
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:

contrib/crossrpms/gcc/install.add

@@ -53,6 +53,9 @@
   rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
 %endif
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
+
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-@tool_target@-gcjh%{_exeext}
 

contrib/crossrpms/gcc/prep.add

@@ -45,8 +45,11 @@ cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
 %if %{with gcc_stdint}
-rm newlib-%{newlib_version}/newlib/libc/include/stdint.h
+  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
 %endif
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 %endif
 
 %if 0%{?_build_mpfr}

contrib/crossrpms/gcc/target-gcc.add

@@ -46,7 +46,9 @@ libgcc @tool_target@-gcc.
 %{_bindir}/@tool_target@-gcc%{_exeext}
 %{_bindir}/@tool_target@-gcc-%{gcc_version}%{_exeext}
 %{_bindir}/@tool_target@-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/@tool_target@-gccbug
+%endif
 
 %sysdir %{_libexecdir}
 %dir %{_libexecdir}/gcc