5 files changed, 15 insertions, 14 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index e1f311c1dc..aca36e21a6 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,11 @@
 2001-09-13	Joel Sherrill <joel@OARcorp.com>
 
+	* setup.def, gccnewlib/gccnewlib.add, gccnewlib/target-gcc.add:
+	Revert changes because of gcc 2.5.x/3.0 transition and continue
+	to support gcc 2.95.x as primary version.
+
+2001-09-13	Joel Sherrill <joel@OARcorp.com>
+
 	* mkgccnewlibspec.in, 
 	Use Target_alias not target_alias to avoid conflicts with new autoconf.
 	* setup.def: Changed version numbers in attempt at building gcc 3.0.1.
diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add
index b005b02926..61b97ccea7 100644
--- a/scripts/gccnewlib/base-gcc.add
+++ b/scripts/gccnewlib/base-gcc.add
@@ -24,14 +24,10 @@ This is the files for gcc and newlib that are shared by all targets.
 
 %dir /opt/rtems/man
 %dir /opt/rtems/man/man1
-# not in gcc 3.x -- only in gcc 2.x
-# %doc /opt/rtems/man/man1/cccp.1
+%doc /opt/rtems/man/man1/cccp.1
 
 %dir /opt/rtems/include
-# gcc 3.0.1 specific
-/opt/rtems/include/g++-v3
-# gcc 2.x specific
-# /opt/rtems/include/g++-3
+/opt/rtems/include/g++-3
 
 %post -n rtems-base-gcc
   if test -d $RPM_INSTALL_PREFIX/rtems/info; 
diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add
index 9f0573dff6..9ff6197109 100644
--- a/scripts/gccnewlib/gccnewlib.add
+++ b/scripts/gccnewlib/gccnewlib.add
@@ -18,10 +18,10 @@ Autoreqprov:  	on
 Packager:     	corsepiu@faw.uni-ulm.de and joel@OARcorp.com
 
 Version:      	gcc@gcc_version@newlib@newlib_version@
-# gcc 3.x and gcc 2.9 
-Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.bz2
+# gcc 3.x and gcc 2.9
+# Source0:      ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.bz2
 # gcc 2.95.x
-#Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/gcc-everything-@gcc_version@.tar.bz2
+Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/gcc-everything-@gcc_version@.tar.gz
 Source1:	ftp://sourceware.cygnus.com/pub/newlib/newlib-@newlib_version@.tar.gz
 Patch0:		gcc-@gcc_version@-rtems-@gcc_patch_version@.diff
 Patch1:		newlib-@newlib_version@-rtems-@newlib_patch_version@.diff
diff --git a/scripts/gccnewlib/target-gcc.add b/scripts/gccnewlib/target-gcc.add
index 27c80ed5e0..d147b8738b 100644
--- a/scripts/gccnewlib/target-gcc.add
+++ b/scripts/gccnewlib/target-gcc.add
@@ -20,9 +20,8 @@ This is gcc and newlib C Library for @target_alias@.
 /opt/rtems/bin/@target_alias@-c++@exe_ext@
 /opt/rtems/bin/@target_alias@-g++@exe_ext@
 /opt/rtems/bin/@target_alias@-gcc@exe_ext@
-# not in gcc 3.x 
-# /opt/rtems/bin/@target_alias@-protoize@exe_ext@
-# /opt/rtems/bin/@target_alias@-unprotoize@exe_ext@
+/opt/rtems/bin/@target_alias@-protoize@exe_ext@
+/opt/rtems/bin/@target_alias@-unprotoize@exe_ext@
 
 %dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include
 
diff --git a/scripts/setup.def b/scripts/setup.def
index bb7cce6b27..e2757837f9 100644
--- a/scripts/setup.def
+++ b/scripts/setup.def
@@ -8,8 +8,8 @@ binutils_patch_version=NA-BUILDING-GCC
 binutils_rpm_release=3
 newlib_version=1.9.0
 newlib_patch_version=20010622
-gcc_version=3.0.1
-gcc_patch_version=20010905
+gcc_version=2.95.3
+gcc_patch_version=20010622a
 gccnewlib_rpm_release=1
 gdb_version=5.0
 gdb_patch_version=20010314