On 11/15/2014 01:14 AM, Chris Johns wrote:
>>> Excellent. I suggest you provide git patches for the rtems-tools.git repo
>>> to add the patches and then provide RSB patches for the sparc gdb build to
>>> use them. There are specific sparc patches already present which need
>>> updating as they are currently stopping us moving off
>>> gdb-7.7.
>>
>> I tried to move RBS to gdb-7.8.1, but there were several other
>> dependency problems that I could not (easily) fix.
>
> Are these gdb, RSB, or rtems-tools patch issues ?
I have fixed this now, and attached a patch to switch rtems-sparc to gdb-7.8.1.
The patch goes on top of the previous, and could probably be squished with it.
The culprit was that FSF does not distribute .bz2 files of gdb-7.8.1, only .gz
and .xz .
I fixed this by adding a new source-builder/config/gdb-7.8.1-1.cfg file. The
sis patch
for gdb-7.7 also applies on gdb-7.8.1 so no need to update rtems-tools.
Jiri.
>From fff12ec9eb81f6078b5078db866b61c70810739d Mon Sep 17 00:00:00 2001
From: Jiri Gaisler <j...@gaisler.se>
Date: Sat, 15 Nov 2014 20:56:43 +0100
Subject: [PATCH] rtems-sparc: switch to gdb-7.8.1
---
rtems/config/4.11/rtems-sparc.bset | 4 +-
rtems/config/tools/rtems-gdb-7.8.1-1.cfg | 28 +++++++
source-builder/config/gdb-7.8.1-1.cfg | 122 +++++++++++++++++++++++++++++++
3 files changed, 152 insertions(+), 2 deletions(-)
create mode 100644 rtems/config/tools/rtems-gdb-7.8.1-1.cfg
create mode 100644 source-builder/config/gdb-7.8.1-1.cfg
diff --git a/rtems/config/4.11/rtems-sparc.bset b/rtems/config/4.11/rtems-sparc.bset
index b1e7ba4..a98b8d3 100644
--- a/rtems/config/4.11/rtems-sparc.bset
+++ b/rtems/config/4.11/rtems-sparc.bset
@@ -15,7 +15,7 @@
# GDB patches
#
%patch add gdb %{rtems_gdb_patches}/sparc/gdb-7.7-sis-leon2-leon3-fixup.diff
-%hash md5 gdb-7.7-sis-leon2-leon3-fixup.diff e1c551487a516eee2931a6ee932047b6
+%hash md5 gdb-7.7-sis-leon2-leon3-fixup.diff afa25717cd54de8bfd103daaa754b6d7
#
# If Windows (MinGW) do not build the simulator.
@@ -29,6 +29,6 @@
devel/expat-2.1.0-1
tools/rtems-binutils-2.24-1
tools/rtems-gcc-4.9.2-newlib-git-1
-tools/rtems-gdb-7.7-1
+tools/rtems-gdb-7.8.1-1
tools/rtems-tools-4.11-1
tools/rtems-kernel-4.11
diff --git a/rtems/config/tools/rtems-gdb-7.8.1-1.cfg b/rtems/config/tools/rtems-gdb-7.8.1-1.cfg
new file mode 100644
index 0000000..297650d
--- /dev/null
+++ b/rtems/config/tools/rtems-gdb-7.8.1-1.cfg
@@ -0,0 +1,28 @@
+#
+# GDB 7.8.1
+#
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define gdb_version 7.8.1
+
+%hash md5 gdb-%{gdb_version}.tar.gz 997492cc3475c96f35ecc8775248c9b1
+
+#
+# Clean up the sim-arange inline code so it builds.
+#
+%patch add gdb %{rtems_gdb_patches}/gdb-sim-arange-inline.diff
+%hash md5 gdb-sim-arange-inline.diff 11bb2936ea29afeaa023077191fd4705
+%patch add gdb %{rtems_gdb_patches}/gdb-sim-cgen-inline.diff
+%hash md5 gdb-sim-cgen-inline.diff e6f7d6d7295cdba99f51aab514ea9778
+
+%if %{_build_os} == freebsd
+ %patch add gdb -p0 %{rtems_gdb_patches}/patch-gdb-python-python-config.py
+ %hash md5 patch-gdb-python-python-config.py c0260fcca4c1a5509635049c0094eee3
+%endif
+
+#
+# The gdb build instructions. We use 7.xx Release 1.
+#
+%include %{_configdir}/gdb-7.8.1-1.cfg
diff --git a/source-builder/config/gdb-7.8.1-1.cfg b/source-builder/config/gdb-7.8.1-1.cfg
new file mode 100644
index 0000000..45d3272
--- /dev/null
+++ b/source-builder/config/gdb-7.8.1-1.cfg
@@ -0,0 +1,122 @@
+#
+# GDB 7.xx Version 1.
+#
+# This configuration file configure's, make's and install's gdb.
+#
+
+#
+# See if the simulator has been disabled for Windows.
+#
+%if %{_host_os} == mingw32
+ %if %{defined win32-gdb-disable-sim}
+ %define gdb-disable-sim 1
+ %endif
+%endif
+
+#
+# Default to building simulators.
+#
+%ifn %{defined gdb-disable-sim}
+ %define gdb-disable-sim 0
+%else
+ %undefine gdb-sim-options
+%endif
+
+%include %{_configdir}/checks.cfg
+
+#
+# Select Snapshot Macro Maps
+#
+%select gdb-snapshot
+%select expat-snapshot
+
+#
+# The description.
+#
+Name: %{_target}-gdb-%{gdb_version}-%{release}
+Summary: GDB v%{gdb_version} for target %{_target} on host %{_host}
+Version: %{gdb_version}
+Release: %{release}
+URL: http://www.gnu.org/software/gdb/
+BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
+
+#
+# Source
+#
+%source set gdb http://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.gz
+
+#
+# Disable Python on Cxc builds for now.
+#
+%if "%{_build}" != "%{_host}"
+ %define without_python
+%endif
+
+#
+#
+# Prepare the source code.
+#
+%prep
+ build_top=$(pwd)
+
+ source_dir_gdb="gdb-%{gdb_version}"
+ %source setup gdb -q -n gdb-%{gdb_version}
+ %patch setup gdb -p1
+
+ cd ${build_top}
+
+%build
+ build_top=$(pwd)
+
+ %{build_directory}
+
+ mkdir -p ${build_dir}
+ cd ${build_dir}
+
+ %{host_build_flags}
+
+ if test "%{_build}" != "%{_host}" ; then
+ GDB_LIBS_STATIC="-lexpat"
+ else
+ GDB_LIBS_STATIC="-lexpat"
+ GDB_LIBS="%{_forced_static}"
+ fi
+
+ LIBS_STATIC=${GDB_LIBS_STATIC} \
+ LIBS=${GDB_LIBS} \
+ ../${source_dir_gdb}/configure \
+ --build=%{_build} --host=%{_host} \
+ --target=%{_target} \
+ --verbose --disable-nls \
+ --without-included-gettext \
+ --disable-win32-registry \
+ --disable-werror \
+ %{!?gdb-disable-sim:--enable-sim}%{?gdb-disable-sim:--disable-sim} \
+ %{?gdb-sim-options:%{gdb-sim-options}} \
+ --without-zlib \
+ --with-expat \
+ %{!?without_python:--with-python} \
+ --prefix=%{_prefix} --bindir=%{_bindir} \
+ --exec-prefix=%{_exec_prefix} \
+ --includedir=%{_includedir} --libdir=%{_libdir} \
+ --mandir=%{_mandir} --infodir=%{_infodir}
+
+ %{__make} %{?_smp_mflags} all
+
+ cd ${build_top}
+
+%install
+ build_top=$(pwd)
+
+ %{__rmdir} $SB_BUILD_ROOT
+
+ cd ${build_dir}
+ %{__make} DESTDIR=$SB_BUILD_ROOT install
+
+ # Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
+ %{__rmdir} $SB_BUILD_ROOT%{_infodir}/configure.info*
+
+ %{__rmfile} $SB_BUILD_ROOT%{_infodir}/dir
+ touch $SB_BUILD_ROOT%{_infodir}/dir
+
+ cd ${build_top}
--
1.9.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
