3 files changed, 10 insertions, 2 deletions
diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add
index d6a4b65cb3..61b97ccea7 100644
--- a/scripts/gccnewlib/base-gcc.add
+++ b/scripts/gccnewlib/base-gcc.add
@@ -20,7 +20,6 @@ This is the files for gcc and newlib that are shared by all targets.
 %doc /opt/rtems/info/libm.info*.gz
 
 %dir /opt/rtems/bin
-/opt/rtems/bin/cpp@exe_ext@
 /opt/rtems/bin/gcov@exe_ext@
 
 %dir /opt/rtems/man
diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add
index fe656e6c28..92ef38b59e 100644
--- a/scripts/gccnewlib/gccnewlib.add
+++ b/scripts/gccnewlib/gccnewlib.add
@@ -1,7 +1,7 @@
 #
 # spec file for building gcc for rtems
 # 
-# Copyright  (c) 1999,2000 OARCorp, Huntsville, AL
+# Copyright  (c) 1999,2000,2001 OARCorp, Huntsville, AL
 #
 # please send bugfixes or comments to joel@OARcorp.com
 #
@@ -88,6 +88,14 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   # cd back to build/
   cd ../..
 
+  # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
+  # Rename it to target_alias-cpp
+  if test -f $RPM_BUILD_ROOT/opt/rtems/bin/cpp@exe_ext@;
+  then
+    mv $RPM_BUILD_ROOT/opt/rtems/bin/cpp@exe_ext@ \
+      $RPM_BUILD_ROOT/opt/rtems/bin/@target_alias@-cpp@exe_ext@
+  fi
+
   # gzip info files
   gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null
   gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null
diff --git a/scripts/gccnewlib/target-gcc.add b/scripts/gccnewlib/target-gcc.add
index 3f78469362..d147b8738b 100644
--- a/scripts/gccnewlib/target-gcc.add
+++ b/scripts/gccnewlib/target-gcc.add
@@ -16,6 +16,7 @@ This is gcc and newlib C Library for @target_alias@.
 %doc /opt/rtems/man/man1/@target_alias@-gcc.1
 %doc /opt/rtems/man/man1/@target_alias@-g++.1
 
+/opt/rtems/bin/@target_alias@-cpp@exe_ext@
 /opt/rtems/bin/@target_alias@-c++@exe_ext@
 /opt/rtems/bin/@target_alias@-g++@exe_ext@
 /opt/rtems/bin/@target_alias@-gcc@exe_ext@