Regenerate.

11 files changed, 337 insertions, 149 deletions

diff --git a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec
index d35b3fe075..342ab8742d 100644
--- a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec
@@ -19,21 +19,25 @@
 %define debug_package		%{nil}
 %endif
 
-%define gdb_version 6.7.1
-%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define gdb_version 6.8
+%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
 
 Name:		rtems-4.9-arm-rtems4.9-gdb
 Summary:	Gdb for target arm-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,26 +48,33 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "arm-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20080324.diff
-Patch1:		gdb-6.7.1-gdb-6.7.90-config.diff
+%if "%{gdb_version}" == "6.8"
+Patch0:		gdb-6.8-rtems4.9-20080428.diff
 %endif
 
 %description
@@ -77,10 +88,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -167,7 +185,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-arm-rtems4.9-gdb
-
 GNU gdb targetting arm-rtems4.9.
 
 %files -n rtems-4.9-arm-rtems4.9-gdb
diff --git a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec
index 79d828c4b8..6972732c18 100644
--- a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec
@@ -19,21 +19,25 @@
 %define debug_package		%{nil}
 %endif
 
-%define gdb_version 6.7.1
-%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define gdb_version 6.8
+%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
 
 Name:		rtems-4.9-avr-rtems4.9-gdb
 Summary:	Gdb for target avr-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,26 +48,33 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "avr-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20080324.diff
-Patch1:		gdb-6.7.1-gdb-6.7.90-config.diff
+%if "%{gdb_version}" == "6.8"
+Patch0:		gdb-6.8-rtems4.9-20080428.diff
 %endif
 
 %description
@@ -77,10 +88,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -167,7 +185,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-avr-rtems4.9-gdb
-
 GNU gdb targetting avr-rtems4.9.
 
 %files -n rtems-4.9-avr-rtems4.9-gdb
diff --git a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec
index 57d781f231..35e422d52b 100644
--- a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec
@@ -19,6 +19,12 @@
 %define debug_package		%{nil}
 %endif
 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.5
 %define gdb_rpmvers %{expand:%(echo 6.5 | tr - _)} 
 
@@ -26,14 +32,12 @@ Name:		rtems-4.9-bfin-rtems4.9-gdb
 Summary:	Gdb for target bfin-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,18 +48,26 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "bfin-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
@@ -74,10 +86,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -164,7 +183,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-bfin-rtems4.9-gdb
-
 GNU gdb targetting bfin-rtems4.9.
 
 %files -n rtems-4.9-bfin-rtems4.9-gdb
diff --git a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec
index cb911cc102..41a6bc9bd6 100644
--- a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec
@@ -19,21 +19,25 @@
 %define debug_package		%{nil}
 %endif
 
-%define gdb_version 6.7.1
-%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define gdb_version 6.8
+%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
 
 Name:		rtems-4.9-h8300-rtems4.9-gdb
 Summary:	Gdb for target h8300-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,26 +48,33 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "h8300-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20080324.diff
-Patch1:		gdb-6.7.1-gdb-6.7.90-config.diff
+%if "%{gdb_version}" == "6.8"
+Patch0:		gdb-6.8-rtems4.9-20080428.diff
 %endif
 
 %description
@@ -77,10 +88,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -167,7 +185,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-h8300-rtems4.9-gdb
-
 GNU gdb targetting h8300-rtems4.9.
 
 %files -n rtems-4.9-h8300-rtems4.9-gdb
diff --git a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec
index b193459f6a..257fc1e120 100644
--- a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec
@@ -19,21 +19,25 @@
 %define debug_package		%{nil}
 %endif
 
-%define gdb_version 6.7.1
-%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define gdb_version 6.8
+%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
 
 Name:		rtems-4.9-i386-rtems4.9-gdb
 Summary:	Gdb for target i386-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,26 +48,33 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "i386-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20080324.diff
-Patch1:		gdb-6.7.1-gdb-6.7.90-config.diff
+%if "%{gdb_version}" == "6.8"
+Patch0:		gdb-6.8-rtems4.9-20080428.diff
 %endif
 
 %description
@@ -77,10 +88,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -167,7 +185,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-i386-rtems4.9-gdb
-
 GNU gdb targetting i386-rtems4.9.
 
 %files -n rtems-4.9-i386-rtems4.9-gdb
diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec
index 759fea57a5..9dbf76030a 100644
--- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec
@@ -19,21 +19,25 @@
 %define debug_package		%{nil}
 %endif
 
-%define gdb_version 6.7.1
-%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define gdb_version 6.8
+%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
 
 Name:		rtems-4.9-m68k-rtems4.9-gdb
 Summary:	Gdb for target m68k-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,26 +48,33 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "m68k-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20080324.diff
-Patch1:		gdb-6.7.1-gdb-6.7.90-config.diff
+%if "%{gdb_version}" == "6.8"
+Patch0:		gdb-6.8-rtems4.9-20080428.diff
 %endif
 
 %description
@@ -77,10 +88,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -167,7 +185,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-m68k-rtems4.9-gdb
-
 GNU gdb targetting m68k-rtems4.9.
 
 %files -n rtems-4.9-m68k-rtems4.9-gdb
diff --git a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec
index f10b29e757..9d4cd6849a 100644
--- a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec
@@ -19,21 +19,25 @@
 %define debug_package		%{nil}
 %endif
 
-%define gdb_version 6.7.1
-%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define gdb_version 6.8
+%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
 
 Name:		rtems-4.9-mips-rtems4.9-gdb
 Summary:	Gdb for target mips-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,26 +48,33 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "mips-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20080324.diff
-Patch1:		gdb-6.7.1-gdb-6.7.90-config.diff
+%if "%{gdb_version}" == "6.8"
+Patch0:		gdb-6.8-rtems4.9-20080428.diff
 %endif
 
 %description
@@ -77,10 +88,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -167,7 +185,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-mips-rtems4.9-gdb
-
 GNU gdb targetting mips-rtems4.9.
 
 %files -n rtems-4.9-mips-rtems4.9-gdb
diff --git a/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec
index 19c63d0bab..d6fb56dd31 100644
--- a/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec
@@ -19,21 +19,25 @@
 %define debug_package		%{nil}
 %endif
 
-%define gdb_version 6.7.1
-%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define gdb_version 6.8
+%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
 
 Name:		rtems-4.9-mipstx39-rtems4.9-gdb
 Summary:	Gdb for target mipstx39-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,26 +48,33 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "mipstx39-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20080324.diff
-Patch1:		gdb-6.7.1-gdb-6.7.90-config.diff
+%if "%{gdb_version}" == "6.8"
+Patch0:		gdb-6.8-rtems4.9-20080428.diff
 %endif
 
 %description
@@ -77,10 +88,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -167,7 +185,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-mipstx39-rtems4.9-gdb
-
 GNU gdb targetting mipstx39-rtems4.9.
 
 %files -n rtems-4.9-mipstx39-rtems4.9-gdb
diff --git a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec
index e61361a076..da22162bf5 100644
--- a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec
@@ -19,21 +19,25 @@
 %define debug_package		%{nil}
 %endif
 
-%define gdb_version 6.7.1
-%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define gdb_version 6.8
+%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
 
 Name:		rtems-4.9-powerpc-rtems4.9-gdb
 Summary:	Gdb for target powerpc-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,26 +48,33 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "powerpc-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20080324.diff
-Patch1:		gdb-6.7.1-gdb-6.7.90-config.diff
+%if "%{gdb_version}" == "6.8"
+Patch0:		gdb-6.8-rtems4.9-20080428.diff
 %endif
 
 %description
@@ -77,10 +88,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -167,7 +185,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-powerpc-rtems4.9-gdb
-
 GNU gdb targetting powerpc-rtems4.9.
 
 %files -n rtems-4.9-powerpc-rtems4.9-gdb
diff --git a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec
index aa7ecebee5..2bd426ac9e 100644
--- a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec
@@ -19,21 +19,25 @@
 %define debug_package		%{nil}
 %endif
 
-%define gdb_version 6.7.1
-%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define gdb_version 6.8
+%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
 
 Name:		rtems-4.9-sh-rtems4.9-gdb
 Summary:	Gdb for target sh-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,26 +48,33 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "sh-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20080324.diff
-Patch1:		gdb-6.7.1-gdb-6.7.90-config.diff
+%if "%{gdb_version}" == "6.8"
+Patch0:		gdb-6.8-rtems4.9-20080428.diff
 %endif
 
 %description
@@ -77,10 +88,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -167,7 +185,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-sh-rtems4.9-gdb
-
 GNU gdb targetting sh-rtems4.9.
 
 %files -n rtems-4.9-sh-rtems4.9-gdb
diff --git a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec
index b1b40e66f9..3ff5bdcc2a 100644
--- a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec
@@ -19,21 +19,25 @@
 %define debug_package		%{nil}
 %endif
 
-%define gdb_version 6.7.1
-%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define gdb_version 6.8
+%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
 
 Name:		rtems-4.9-sparc-rtems4.9-gdb
 Summary:	Gdb for target sparc-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.9-%{_host}-gcc
-%endif
+BuildRequires:  %{_host_rpmprefix}gcc
 
 %if "%{gdb_version}" >= "6.6"
 # suse
@@ -44,26 +48,33 @@ BuildRequires: libexpat-devel
 BuildRequires: expat
 %endif
 %else
-# fedora/redhat 
-BuildRequires:	expat-devel
+# fedora/redhat/cygwin
+BuildRequires: %{_host_rpmprefix}expat-devel
+%endif
+%endif
+
+%if "%{gdb_version}" < "6.6"
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
 %endif
+BuildRequires:  %{_host_rpmprefix}readline-devel
+BuildRequires:  %{_host_rpmprefix}ncurses-devel
+
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "sparc-rtems4.9" == "sparc-rtems4.9"
 BuildConflicts:	libtermcap-devel termcap-devel
 %endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20080324.diff
-Patch1:		gdb-6.7.1-gdb-6.7.90-config.diff
+%if "%{gdb_version}" == "6.8"
+Patch0:		gdb-6.8-rtems4.9-20080428.diff
 %endif
 
 %description
@@ -77,10 +88,17 @@ cd gdb-%{gdb_version}
 %{?PATCH1:%patch1 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.8"
+# Force using a system-provided libreadline
+rm -f gdb-%{gdb_version}/readline/configure
+%endif
 %build
   export PATH="%{_bindir}:${PATH}"
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
@@ -167,7 +185,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-sparc-rtems4.9-gdb
-
 GNU gdb targetting sparc-rtems4.9.
 
 %files -n rtems-4.9-sparc-rtems4.9-gdb