From de819f6e8973cc9fa46a995d2adba9b8c49e9f04 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 10 Feb 2003 16:32:27 +0000
Subject: 2003-02-10	Joel Sherrill <joel@OARcorp.com>

	* gdb/gdb.add, gdb/mkspec.in, gdb/target-gdb.add: Use RPM logic to
	determine which targets have simulators, configure with appropriate
	arguments, and package the correct files.
---
 scripts/ChangeLog          |  6 ++++++
 scripts/gdb/gdb.add        | 24 +++++++++++++++++++++++-
 scripts/gdb/mkspec.in      | 16 ----------------
 scripts/gdb/target-gdb.add |  4 ++++
 4 files changed, 33 insertions(+), 17 deletions(-)

(limited to 'scripts')

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 0e33383286..008b815153 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-10	Joel Sherrill <joel@OARcorp.com>
+
+	* gdb/gdb.add, gdb/mkspec.in, gdb/target-gdb.add: Use RPM logic to
+	determine which targets have simulators, configure with appropriate
+	arguments, and package the correct files.
+
 2003-02-07	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* gcc3newlib/target-gcc.add: Remove %{_exeext} from gccbug.
diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add
index 900f741536..b939352fff 100644
--- a/scripts/gdb/gdb.add
+++ b/scripts/gdb/gdb.add
@@ -30,6 +30,17 @@ BuildPreReq:	ncurses-devel
 #
 NoSource:      0
 
+#  Account as best possible for targets without simulators
+#  and targets which require extra arguments.
+%define _sim	1
+
+%if "@target_alias@" == "m68k-rtems"
+%define _sim	0
+%endif
+%if "@target_alias@" == "i386-rtems"
+%define _sim	0
+%endif
+
 
 %description
 RTEMS is an open source operating system for embedded systems.
@@ -46,12 +57,23 @@ cd gdb-@gdb_version@
 %patch2 -p1
 
 %build
+%if "%_sim" == "1"
+ simargs="--enable-sim"
+%endif
+
+%if "@target_alias@" == "powerpc-rtems"
+ simargs="$simargs --enable-sim-timebase --enable-sim-hardware"
+ #  Enabling this causes the program image to be huge and causes
+ #  some gcc/hosts combinations to run out of memory.
+ # simargs="$simargs --enable-sim-inline"
+%endif
+
 test -d build || mkdir build
   cd build
   ../gdb-@gdb_version@/configure \
     --build=%_build --host=%_host \
     --target=@target_alias@ \
-    --verbose --prefix=%{_prefix} @extra_configure_arguments@ \
+    --verbose --prefix=%{_prefix} $simargs \
     --disable-nls
 
   make all
diff --git a/scripts/gdb/mkspec.in b/scripts/gdb/mkspec.in
index bb4e85204d..12e20928fa 100644
--- a/scripts/gdb/mkspec.in
+++ b/scripts/gdb/mkspec.in
@@ -48,22 +48,6 @@ target_alias=$1
 
 . ./$CFG
 
-case ${target_alias} in
-  arm* | d10v* | d30v* | erc32* | fr30* | h8300* | h8500* | hppa1.1* | \
-  i960* | m32r* | mcore* | mips* | mn10200* | mn10300* | sh* | sparc*| \
-  v850* | w65* | z8k*)
-    extra_configure_arguments="--enable-sim"
-    ;;
-  powerpc*)
-    extra_configure_arguments="--enable-sim --enable-sim-powerpc --enable-sim-timebase --enable-sim-hardware"
-    #  Enabling this causes the program image to be huge and causes
-    #  some gcc/hosts combinations to run out of memory.
-    #          --enable-sim-inline
-    ;;
-  *)
-    ;;
-esac
-
 sed -e "s%@Release\@%${gdb_rpm_release}%g" \
     -e "s,@rpm_build_root\@,${rpm_build_root},g" \
     -e "s%@prefix\@%@prefix@%g" \
diff --git a/scripts/gdb/target-gdb.add b/scripts/gdb/target-gdb.add
index 7d3de235f4..76b3724634 100644
--- a/scripts/gdb/target-gdb.add
+++ b/scripts/gdb/target-gdb.add
@@ -17,11 +17,15 @@ This is the GNU gdb for RTEMS targetting @target_alias@.
 %files -n @target_alias@-gdb
 %defattr(-,attr,attr)
 %doc %{_prefix}/man/man1/@target_alias@-gdb.1*
+%if "%_sim" == "1"
 %doc %{_prefix}/man/man1/@target_alias@-run.1*
+%endif
 
 %dir %{_prefix}/bin
 %{_prefix}/bin/@target_alias@-gdb%{_exeext}
+%if "%_sim" == "1"
 %{_prefix}/bin/@target_alias@-run%{_exeext}
+%endif
 %if "@target_alias@" == "sparc-rtems"
 %{_prefix}/bin/@target_alias@-sis%{_exeext}
 %endif
-- 
cgit v1.2.3