Sync with rtems-4.8.

4 files changed, 39 insertions, 36 deletions

diff --git a/contrib/crossrpms/gdb/base-gdb.add b/contrib/crossrpms/gdb/base-gdb.add
index b01fa13c0e..12f455baf4 100644
--- a/contrib/crossrpms/gdb/base-gdb.add
+++ b/contrib/crossrpms/gdb/base-gdb.add
@@ -8,41 +8,22 @@ Group: Development/Tools
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-Provides:	@rpmprefix@rtems4.7-base-gdb = %{gdb_version}-%{release}
-Obsoletes:	@rpmprefix@rtems4.7-base-gdb < %{gdb_version}-%{release}
-Provides:	@rpmprefix@rtems-base-gdb = %{gdb_version}-%{release}
-Obsoletes:	@rpmprefix@rtems-base-gdb < %{gdb_version}-%{release}
-
 %description -n @rpmprefix@gdb-common
 
 GDB files shared by all targets.
 
 %post -n @rpmprefix@gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
-%if "%{gdb_version}" >= "5.0"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-%endif
-%if "{gdb_version}" >= "6.0"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-%endif
 
 %preun -n @rpmprefix@gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
-%if "%{gdb_version}" >= "5.0"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-%endif
-%if "{gdb_version}" >= "6.0"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-%endif
 fi
 
 %files -n @rpmprefix@gdb-common
@@ -51,18 +32,8 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
-# FIXME: When had gdbint and stabs been introduced?
-%if "%{gdb_version}" >= "5.0"
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
-%endif
-
-%if "{gdb_version}" >= "6.0"
 %{_infodir}/annotate.info*
-%endif
 
 %endif
diff --git a/contrib/crossrpms/gdb/build.add b/contrib/crossrpms/gdb/build.add
index cbc375d15b..cb59d3fe4f 100644
--- a/contrib/crossrpms/gdb/build.add
+++ b/contrib/crossrpms/gdb/build.add
@@ -1,6 +1,12 @@
 %build
+%if "%{_prefix}" != "/usr"
+  export PATH="%{_bindir}:${PATH}"
+%endif
   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 \
@@ -10,12 +16,16 @@
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --with-sysroot=%{_prefix}/@tool_target@/sys-root \
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
 %if %build_infos
   make info
 %endif
diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add
index 4dfc69f7a5..140603b16e 100644
--- a/contrib/crossrpms/gdb/gdb.add
+++ b/contrib/crossrpms/gdb/gdb.add
@@ -5,23 +5,41 @@ Name:		@rpmprefix@@tool_target@-gdb
 Summary:	Gdb for target @tool_target@
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	@GDB_RPMREL@%{?dist}
+Release:	@GDB_RPMREL@
 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"
-BuildRequires:	expat-devel
+# suse
+%if "%{?suse}"
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# 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
+
 %if %build_infos
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %endif
-%if "@tool_target@" == "sparc-rtems4.7"
-BuildRequires:	libtermcap-devel
-%endif
-BuildRequires:	ncurses-devel
+
 %if %build_infos
 
 Requires:	@rpmprefix@gdb-common
diff --git a/contrib/crossrpms/gdb/prep.add b/contrib/crossrpms/gdb/prep.add
index 8ceb63ea4a..dedd1d2cbf 100644
--- a/contrib/crossrpms/gdb/prep.add
+++ b/contrib/crossrpms/gdb/prep.add
@@ -6,3 +6,7 @@ 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