[rtems-source-builder commit] sparc-gdb: use patch for leon2/ 3 support to sis

[Chris Johns]

Module:    rtems-source-builder
Branch:    master
Commit:    1a0ccb99acc2db08388c1939b7aa44932af0f3d4
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=1a0ccb99acc2db08388c1939b7aa44932af0f3d4

Author:    Jiri Gaisler <jiri at gaisler.se>
Date:      Fri Nov 14 23:21:45 2014 +0100

sparc-gdb: use patch for leon2/3 support to sis

Also fixes the can't compute CFA problem.

---

 rtems/config/4.11/rtems-sparc.bset       |   6 +-
 rtems/config/tools/rtems-gdb-7.8.1-1.cfg |  28 +++++++
 source-builder/config/gdb-7.8.1-1.cfg    | 122 +++++++++++++++++++++++++++++++
 3 files changed, 153 insertions(+), 3 deletions(-)

diff --git a/rtems/config/4.11/rtems-sparc.bset b/rtems/config/4.11/rtems-sparc.bset
index 88983dc..a98b8d3 100644
--- a/rtems/config/4.11/rtems-sparc.bset
+++ b/rtems/config/4.11/rtems-sparc.bset
@@ -14,8 +14,8 @@
 #
 # GDB patches
 #
-%patch add gdb %{rtems_gdb_patches}/sparc/gdb-7.7-sis-output-nouartrx.diff
-%hash  md5 gdb-7.7-sis-output-nouartrx.diff bc35b15de1325f3c4461ac3cda027bea
+%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 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}