Update gdb packaging.

10 files changed, 361 insertions, 91 deletions

diff --git a/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec
index 11d4eabf42..0ee8038694 100644
--- a/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec
@@ -13,6 +13,18 @@
 %define _exeext %{nil}
 %endif
 
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.8-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.6
 %define gdb_rpmvers %{expand:%(echo 6.6 | tr - _)} 
 
@@ -20,11 +32,13 @@ Name:		rtems-4.8-arm-rtems4.8-gdb
 Summary:	Gdb for target arm-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  %{_host_rpmprefix}gcc
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -34,18 +48,23 @@ 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.7"
+%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.8" == "sparc-rtems4.8"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.8-gdb-common
 
@@ -65,9 +84,17 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.7"
+# 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 \
@@ -90,6 +117,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -153,7 +181,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.8-arm-rtems4.8-gdb
-
 GNU gdb targetting arm-rtems4.8.
 
 %files -n rtems-4.8-arm-rtems4.8-gdb
diff --git a/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gdb.spec
index 19731b8509..f17cec6fed 100644
--- a/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gdb.spec
@@ -13,6 +13,18 @@
 %define _exeext %{nil}
 %endif
 
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.8-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.5
 %define gdb_rpmvers %{expand:%(echo 6.5 | tr - _)} 
 
@@ -20,11 +32,13 @@ Name:		rtems-4.8-bfin-rtems4.8-gdb
 Summary:	Gdb for target bfin-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  %{_host_rpmprefix}gcc
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -34,18 +48,23 @@ 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.7"
+%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.8" == "sparc-rtems4.8"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.8-gdb-common
 
@@ -63,9 +82,17 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.7"
+# 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 \
@@ -88,6 +115,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -151,7 +179,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.8-bfin-rtems4.8-gdb
-
 GNU gdb targetting bfin-rtems4.8.
 
 %files -n rtems-4.8-bfin-rtems4.8-gdb
diff --git a/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec
index 12b3117d93..6b5da515d8 100644
--- a/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec
@@ -13,6 +13,18 @@
 %define _exeext %{nil}
 %endif
 
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.8-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.6
 %define gdb_rpmvers %{expand:%(echo 6.6 | tr - _)} 
 
@@ -20,11 +32,13 @@ Name:		rtems-4.8-h8300-rtems4.8-gdb
 Summary:	Gdb for target h8300-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  %{_host_rpmprefix}gcc
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -34,18 +48,23 @@ 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.7"
+%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.8" == "sparc-rtems4.8"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.8-gdb-common
 
@@ -65,9 +84,17 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.7"
+# 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 \
@@ -90,6 +117,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -153,7 +181,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.8-h8300-rtems4.8-gdb
-
 GNU gdb targetting h8300-rtems4.8.
 
 %files -n rtems-4.8-h8300-rtems4.8-gdb
diff --git a/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec
index 5227069e23..7dfe8c1212 100644
--- a/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec
@@ -13,6 +13,18 @@
 %define _exeext %{nil}
 %endif
 
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.8-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.6
 %define gdb_rpmvers %{expand:%(echo 6.6 | tr - _)} 
 
@@ -20,11 +32,13 @@ Name:		rtems-4.8-i386-rtems4.8-gdb
 Summary:	Gdb for target i386-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  %{_host_rpmprefix}gcc
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -34,18 +48,23 @@ 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.7"
+%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.8" == "sparc-rtems4.8"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.8-gdb-common
 
@@ -65,9 +84,17 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.7"
+# 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 \
@@ -90,6 +117,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -153,7 +181,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.8-i386-rtems4.8-gdb
-
 GNU gdb targetting i386-rtems4.8.
 
 %files -n rtems-4.8-i386-rtems4.8-gdb
diff --git a/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec
index 0f5792f2c6..f56771a701 100644
--- a/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec
@@ -13,6 +13,18 @@
 %define _exeext %{nil}
 %endif
 
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.8-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.6
 %define gdb_rpmvers %{expand:%(echo 6.6 | tr - _)} 
 
@@ -20,11 +32,13 @@ Name:		rtems-4.8-m68k-rtems4.8-gdb
 Summary:	Gdb for target m68k-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  %{_host_rpmprefix}gcc
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -34,18 +48,23 @@ 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.7"
+%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.8" == "sparc-rtems4.8"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.8-gdb-common
 
@@ -65,9 +84,17 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.7"
+# 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 \
@@ -90,6 +117,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -153,7 +181,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.8-m68k-rtems4.8-gdb
-
 GNU gdb targetting m68k-rtems4.8.
 
 %files -n rtems-4.8-m68k-rtems4.8-gdb
diff --git a/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec
index 1b55e2c79a..9f8bc7a3bc 100644
--- a/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec
@@ -13,6 +13,18 @@
 %define _exeext %{nil}
 %endif
 
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.8-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.6
 %define gdb_rpmvers %{expand:%(echo 6.6 | tr - _)} 
 
@@ -20,11 +32,13 @@ Name:		rtems-4.8-mips-rtems4.8-gdb
 Summary:	Gdb for target mips-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  %{_host_rpmprefix}gcc
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -34,18 +48,23 @@ 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.7"
+%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.8" == "sparc-rtems4.8"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.8-gdb-common
 
@@ -65,9 +84,17 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.7"
+# 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 \
@@ -90,6 +117,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -153,7 +181,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.8-mips-rtems4.8-gdb
-
 GNU gdb targetting mips-rtems4.8.
 
 %files -n rtems-4.8-mips-rtems4.8-gdb
diff --git a/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec
index e0dd32d492..290bdf8a66 100644
--- a/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec
@@ -13,6 +13,18 @@
 %define _exeext %{nil}
 %endif
 
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.8-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.6
 %define gdb_rpmvers %{expand:%(echo 6.6 | tr - _)} 
 
@@ -20,11 +32,13 @@ Name:		rtems-4.8-mipstx39-rtems4.8-gdb
 Summary:	Gdb for target mipstx39-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  %{_host_rpmprefix}gcc
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -34,18 +48,23 @@ 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.7"
+%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.8" == "sparc-rtems4.8"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.8-gdb-common
 
@@ -65,9 +84,17 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.7"
+# 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 \
@@ -90,6 +117,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -153,7 +181,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.8-mipstx39-rtems4.8-gdb
-
 GNU gdb targetting mipstx39-rtems4.8.
 
 %files -n rtems-4.8-mipstx39-rtems4.8-gdb
diff --git a/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec
index a77ee7576c..1954953038 100644
--- a/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec
@@ -13,6 +13,18 @@
 %define _exeext %{nil}
 %endif
 
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.8-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.6
 %define gdb_rpmvers %{expand:%(echo 6.6 | tr - _)} 
 
@@ -20,11 +32,13 @@ Name:		rtems-4.8-powerpc-rtems4.8-gdb
 Summary:	Gdb for target powerpc-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  %{_host_rpmprefix}gcc
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -34,18 +48,23 @@ 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.7"
+%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.8" == "sparc-rtems4.8"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.8-gdb-common
 
@@ -65,9 +84,17 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.7"
+# 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 \
@@ -90,6 +117,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -153,7 +181,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.8-powerpc-rtems4.8-gdb
-
 GNU gdb targetting powerpc-rtems4.8.
 
 %files -n rtems-4.8-powerpc-rtems4.8-gdb
diff --git a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec
index 0a0900b15a..a7832dc73f 100644
--- a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec
@@ -13,6 +13,18 @@
 %define _exeext %{nil}
 %endif
 
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.8-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.6
 %define gdb_rpmvers %{expand:%(echo 6.6 | tr - _)} 
 
@@ -20,11 +32,13 @@ Name:		rtems-4.8-sh-rtems4.8-gdb
 Summary:	Gdb for target sh-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  %{_host_rpmprefix}gcc
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -34,18 +48,23 @@ 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.7"
+%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.8" == "sparc-rtems4.8"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.8-gdb-common
 
@@ -65,9 +84,17 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.7"
+# 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 \
@@ -90,6 +117,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -153,7 +181,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.8-sh-rtems4.8-gdb
-
 GNU gdb targetting sh-rtems4.8.
 
 %files -n rtems-4.8-sh-rtems4.8-gdb
diff --git a/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-gdb.spec
index 7b9551367d..5f5d469d6e 100644
--- a/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-gdb.spec
@@ -13,6 +13,18 @@
 %define _exeext %{nil}
 %endif
 
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.8-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define gdb_version 6.7.1
 %define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
@@ -20,11 +32,13 @@ Name:		rtems-4.8-sparc-rtems4.8-gdb
 Summary:	Gdb for target sparc-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  %{_host_rpmprefix}gcc
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -34,25 +48,30 @@ 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.7"
+%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.8" == "sparc-rtems4.8"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
-BuildRequires:  readline-devel
-BuildRequires:	ncurses-devel
+
 
 Requires:	rtems-4.8-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.8-20071216.diff
+Patch0:		gdb-6.7.1-rtems4.8-20080429.diff
 %endif
 
 %description
@@ -65,9 +84,17 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
+%if "%{gdb_version}" >= "6.7"
+# 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 \
@@ -90,6 +117,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -153,7 +181,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.8-sparc-rtems4.8-gdb
-
 GNU gdb targetting sparc-rtems4.8.
 
 %files -n rtems-4.8-sparc-rtems4.8-gdb