Add patch from Bob Wilson.

1 files changed, 21 insertions, 18 deletions

diff --git a/baseboards/xtensa-sim.exp b/baseboards/xtensa-sim.exp
index ba5b8e3..bdae12e 100644
--- a/baseboards/xtensa-sim.exp
+++ b/baseboards/xtensa-sim.exp
@@ -1,5 +1,5 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2007
+# Free Software Foundation, Inc.
 #
 # This file is part of DejaGnu.
 #
@@ -17,25 +17,28 @@
 # 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.
+# This is a list of toolchains that are supported on this board.
+set_board_info target_install {xtensa-elf}
+
+# Load the generic configuration for this board.  This will define any
+# routines needed to communicate with the board.
 load_generic_config "sim"
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-# Command to invoke the simulator
+
+# We don't use basic-sim.exp and setup_sim because the simulator, called
+# "xt-run", is external to the build tree.
 set_board_info sim xt-run
-setup_sim xtensa
-# No multilib flags needed by default.
+set_board_info sim,options "--turbo --exit_with_target_code"
+set_board_info is_simulator 1
+
+# No default multilib options are needed for this board.
 process_multilib_options ""
-# 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]"
-set_board_info cflags         "[libgloss_include_flags]
-[newlib_include_flags]"
-set_board_info ldflags        "[libgloss_link_flags] [newlib_link_flags]"
-# This board doesn't use a linker script.
+
+set_board_info compiler  "[find_gcc]"
+set_board_info cflags    "[libgloss_include_flags] [newlib_include_flags]"
+set_board_info ldflags   "[libgloss_link_flags] [newlib_link_flags]"
+
+# No linker script needed.
 set_board_info ldscript ""
-# The simulator doesn't return exit statuses and we need to indicate this.
-set_board_info needs_status_wrapper  1
+
 # No support for signals on this target.
 set_board_info gdb,nosignals 1