* Makefile.am (baseboard_DATA): Add arm-ice.exp, arm-sim.exp.

	* Makefile.in: Regenerate.
	* baseboards/arm-ice.exp: Reinstate.
	* baseboards/arm-sim.exp: Likewise.

5 files changed, 149 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 0cd4939..ad2ad3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2016-03-23  Ben Elliston  <bje@gnu.org>
 
+	* Makefile.am (baseboard_DATA): Add arm-ice.exp, arm-sim.exp.
+	* Makefile.in: Regenerate.
+	* baseboards/arm-ice.exp: Reinstate.
+	* baseboards/arm-sim.exp: Likewise.
+
+2016-03-23  Ben Elliston  <bje@gnu.org>
+
 	* Makefile.am (config_DATA): Update.
 	(baseboard_DATA): Likewise.
 	* Makefile.in: Regenerate.
diff --git a/Makefile.am b/Makefile.am
index 0edc809..b2594d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,9 @@ baseboard_DATA = \
 	baseboards/README \
 	baseboards/androideabi.exp \
 	baseboards/am33_2.0-libremote.exp \
+	baseboards/arm-ice.exp \
 	baseboards/arm-sid.exp \
+	baseboards/arm-sim.exp \
 	baseboards/basic-sid.exp \
 	baseboards/basic-sim.exp \
 	baseboards/cris-sim.exp \
diff --git a/Makefile.in b/Makefile.in
index b537624..75ae4db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -414,7 +414,9 @@ baseboard_DATA = \
 	baseboards/README \
 	baseboards/androideabi.exp \
 	baseboards/am33_2.0-libremote.exp \
+	baseboards/arm-ice.exp \
 	baseboards/arm-sid.exp \
+	baseboards/arm-sim.exp \
 	baseboards/basic-sid.exp \
 	baseboards/basic-sim.exp \
 	baseboards/cris-sim.exp \
diff --git a/baseboards/arm-ice.exp b/baseboards/arm-ice.exp
new file mode 100644
index 0000000..94fa2ce
--- /dev/null
+++ b/baseboards/arm-ice.exp
@@ -0,0 +1,67 @@
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# This file is part of DejaGnu.
+#
+# DejaGnu is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# DejaGnu is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with DejaGnu; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Load the generic configuration for this board. This will define a basic
+# set of routines used to communicate with the board.
+load_generic_config "gdb-comm"
+
+# No multilib flags needed by default.
+process_multilib_options ""
+
+if { [board_info $board obj_format] == "pe" } {
+    set additional_options "-Wl,-oformat,pe-arm-little,--image-base,0"
+} else {
+    set additional_options ""
+}
+
+# basic-sim.exp is a basic description for the standard Cygnus simulator.
+# The compiler used to build for this board. This has *nothing* to do
+# with what compiler is tested if we're testing gcc.
+set_board_info compiler 	"[find_gcc]"
+# The basic set of flags needed to build "hello world" for this
+# board. This board uses libgloss and newlib.
+set_board_info cflags 	"[libgloss_include_flags] [newlib_include_flags]"
+set_board_info ldflags 	"[libgloss_link_flags] [newlib_link_flags] $additional_options"
+# This board doesn't use a linker script.
+set_board_info ldscript ""
+
+# Used by a few gcc.c-torture testcases to delimit how large the stack can
+# be.
+set_board_info gcc,stack_size  16384
+
+# We use "target rdi" to talk to the board.
+set_board_info gdb_protocol "rdi"
+
+# No support for signals.
+set_board_info gdb,nosignals 1
+
+# Make this variable go away, we don't need it.
+unset additional_options
+
+# Can't call functions from GDB.
+set_board_info gdb,cannot_call_functions 1
+
+# Or do I/O.
+set_board_info gdb,noinferiorio 1
+
+# Or have signals.
+set_board_info gdb,nosignals 1
+
+# Exit statuses are invalid.
+set_board_info exit_statuses_bad 1
diff --git a/baseboards/arm-sim.exp b/baseboards/arm-sim.exp
new file mode 100644
index 0000000..f6f31ff
--- /dev/null
+++ b/baseboards/arm-sim.exp
@@ -0,0 +1,71 @@
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# This file is part of DejaGnu.
+#
+# DejaGnu is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# DejaGnu is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with DejaGnu; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Load the generic configuration for this board. This will define a basic
+# set of routines used to communicate with the board.
+load_generic_config "sim"
+
+# No multilib flags needed by default.
+process_multilib_options ""
+
+if { [board_info $board obj_format] == "pe" } {
+    set additional_options "-Wl,-oformat,pe-arm-little,--image-base,0"
+    #    set_board_info uses_underscores 1
+} else {
+
+    #    if [istarget "*-*-coff"] {
+    #        set_board_info uses_underscores 1
+    #    }
+
+    set additional_options ""
+}
+
+# basic-sim.exp is a basic description for the standard Cygnus simulator.
+load_base_board_description "basic-sim"
+
+# The name of the directory in the build tree where the simulator lives.
+setup_sim arm
+
+# The compiler used to build for this board. This has *nothing* to do
+# with what compiler is tested if we're testing gcc.
+set_board_info compiler 	"[find_gcc]"
+
+# The basic set of flags needed to build "hello world" for this
+# board. This board uses libgloss and newlib.
+set_board_info cflags 	"[libgloss_include_flags] [newlib_include_flags]"
+set_board_info ldflags 	"[libgloss_link_flags] [newlib_link_flags] $additional_options"
+
+# This board doesn't use a linker script.
+set_board_info ldscript ""
+
+# The simulator doesn't return exit statuses and we need to indicate this.
+set_board_info needs_status_wrapper  1
+
+# Used by a few gcc.c-torture testcases to delimit how large the stack can
+# be.
+set_board_info gcc,stack_size  16384
+
+# No support for signals.
+set_board_info gdb,nosignals 1
+
+# More time is needed to compile PlumHall tests
+set_board_info gcc,timeout 800
+
+# Make this variable go away, we don't need it.
+unset additional_options