[DejaGnu] Merging sourceware and savanaha dejagnu repositories

[Nick Clifton]

Hi Rob,

  I have found several files that are present in the sourceware
  dejagnu repository but not the savanah repository.  I am attaching
  a patch and a concentrated ChangeLog entry.  Can they be added to
  the savanah repository please ?

Cheers
        Nick

2002-04-19  Nick Clifton  <address@hidden>

        * Import files from sourceware dejagnu repository:

        2002-03-15  Chris Demetriou  <address@hidden>
        * baseboards/mips-sim-idt32.exp: New file.
        2002-01-21  Ben Elliston  <address@hidden>
        * baseboards/sh-sid.exp: New file.
        2001-11-26  Thomas Fitzsimmons  <address@hidden>
        * baseboards/i386-sid.exp: New file.
        2001-10-10  Frank Ch. Eigler  <address@hidden>
        * config/sid.exp (set_host_info): New proc.  Call it to set
        gdb,nointerrupt flag to work around framework problems.
        2001-08-24  Frank Ch. Eigler  <address@hidden>
        * baseboards/basic-sid.exp (find_sid_conf): Tolerate not
        finding path to pregen configuration file.
        2001-02-22  Ben Elliston  <address@hidden>
        * config/sid.exp: New file.
        * baseboards/basic-sid.exp: Likewise.
        * baseboards/arm-sid.exp: Likewise.
        * baseboards/m32r-sid.exp: Likewise.
        * baseboards/m68k-sid.exp: Likewise.

*** /dev/null   Thu Aug 30 21:30:55 2001
--- baseboards/arm-sid.exp      Sun Mar 10 23:09:32 2002
***************
*** 0 ****
--- 1,11 ----
+ # This is a list of toolchains that are supported on this board.
+ set_board_info target_install {arm-elf thumb-elf}
+ set_board_info sim "arm-elf-sid"
+ 
+ # SID does not emulate the FPU
+ process_multilib_options "-msoft-float"
+ set_board_info sim,defaultendian "-EL"
+ 
+ # Load the generic configuration for this board. This will define a basic set
+ # of routines needed by the tool to communicate with the board.
+ load_generic_config "sid"
*** /dev/null   Thu Aug 30 21:30:55 2001
--- baseboards/basic-sid.exp    Sun Mar 10 23:09:32 2002
***************
*** 0 ****
--- 1,58 ----
+ # find_sid -- find a usable SID simulator.
+ # This proc is local to this file and is used to locate a SID to use.
+ # Search the build tree, then $PATH.
+ #
+ # Written by Ben Elliston (address@hidden).
+ 
+ proc find_sid { target_alias } {
+     global env
+     global tool_root_dir
+ 
+     set try [lookfor_file ${tool_root_dir} sid/bsp/${target_alias}-sid]
+     if { $try != "" } {
+       set sid_build [lookfor_file ${tool_root_dir} sid/main/dynamic/sid]
+       if { $sid_build != "" } { set env(SID) $sid_build }
+       return $try
+     }
+ 
+     # In this case, the bsp script must be available on the PATH.
+     # Just hope for the best!
+     return ${target_alias}-sid
+ }
+ 
+ # find_sid_conf -- find a usable pre-generated SID config file.
+ 
+ proc find_sid_conf { config } {
+     global env
+     global srcdir
+ 
+     set try [lookfor_file ${srcdir} sid/bsp/pregen/${config}.conf]
+     if { $try == "" } then { return ${config}.conf } else { return $try }
+ }
+ 
+ # find_rawsid -- find a usable SID simulator.
+ # This proc is local to this file and is used to locate a SID to use.
+ # Search the build tree, then $PATH.
+ 
+ proc find_rawsid { } {
+     global env
+     global tool_root_dir
+     global srcdir
+ 
+     set try [lookfor_file ${tool_root_dir} sid/main/dynamic/sid]
+     if { $try == "" } {
+       set try "sid"
+     } else {
+       # testing build tree
+       set env(SID_LIBRARY_PATH) [join [glob 
"${tool_root_dir}/sid/component/*" "$srcdir/sid/component/*"] ":"]
+       # srcdir=/..../sid/component/testsuite
+       set tcl_library "$srcdir/tcl/library"
+         global host_os
+       switch -glob $host_os {
+         {cygwin*} { set tcl_library [exec cygpath -w $tcl_library] }
+         }
+       set env(TCL_LIBRARY) $tcl_library
+     }
+ 
+     return $try
+ }
*** /dev/null   Thu Aug 30 21:30:55 2001
--- baseboards/i386-sid.exp     Sun Mar 10 23:09:32 2002
***************
*** 0 ****
--- 1,25 ----
+ # This is a list of toolchains that are supported on this board.
+ set_board_info target_install {i386-elf}
+ 
+ # Load a baseboard description for SID simulators.
+ load_base_board_description "basic-sid"
+ 
+ set_board_info sim [find_rawsid]
+ set_board_info sim,protocol "sid"
+ set_board_info ldflags "-nostdlib [libgloss_link_flags] [newlib_link_flags]"
+ set_board_info ldscript "-Tcygmon.ld"
+ set_board_info gdb,start_symbol "__start"
+ 
+ if { ${tool} == "gdb" } {
+     set_board_info sim,options "-f [find_sid_conf i386-gdb]"
+ } else {
+     set_board_info sim,options "-f [find_sid_conf i386-gloss]"
+ }
+ 
+ # Used by a few gcc.c-torture testcases to delimit how large the
+ # stack can be.
+ set_board_info gcc,stack_size 16384
+ 
+ # Load the generic configuration for this board. This will define a basic set
+ # of routines needed by the tool to communicate with the board.
+ load_generic_config "sid"
*** /dev/null   Thu Aug 30 21:30:55 2001
--- baseboards/m32r-sid.exp     Sun Mar 10 23:09:32 2002
***************
*** 0 ****
--- 1,7 ----
+ # This is a list of toolchains that are supported on this board.
+ set_board_info target_install {m32r-elf}
+ set_board_info sim "m32r-elf-sid"
+ 
+ # Load the generic configuration for this board. This will define a basic set
+ # of routines needed by the tool to communicate with the board.
+ load_generic_config "sid"
*** /dev/null   Thu Aug 30 21:30:55 2001
--- baseboards/m68k-sid.exp     Sun Mar 10 23:09:32 2002
***************
*** 0 ****
--- 1,7 ----
+ # This is a list of toolchains that are supported on this board.
+ set_board_info target_install {m68k-elf}
+ set_board_info sim "m68k-elf-sid"
+ 
+ # Load the generic configuration for this board. This will define a basic set
+ # of routines needed by the tool to communicate with the board.
+ load_generic_config "sid"
*** /dev/null   Thu Aug 30 21:30:55 2001
--- baseboards/mips-sim-idt64.exp       Sun Mar 10 23:09:32 2002
***************
*** 0 ****
--- 1,36 ----
+ # Load the generic configuration for this board. This will define a basic
+ # set of routines needed by the tool 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";
+ 
+ # This tells it which directory to look in for the simulator.
+ setup_sim mips;
+ 
+ # No multilib flags are set by default.
+ 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 needs_status_wrapper 1
+ 
+ set_board_info cflags "[libgloss_include_flags] [newlib_include_flags]";
+ set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]";
+ 
+ # Use idt.
+ if { [board_info $board obj_format] == "ecoff" } {
+     set_board_info ldscript "-Wl,-Tidtecoff.ld";
+ } else {
+     set_board_info ldscript "-Wl,-Tidt64.ld";
+ }
+ 
+ # And, it can't do arguments, and doesn't have real signals.
+ set_board_info noargs 1;
+ set_board_info gdb,nosignals 1;
+ 
+ # Tell gdb to assume no fpu for -msoft-float compilation
+ if {[string match "*soft-float*" $current_target_name]} {
+   set_board_info gdb_init_command "set mipsfpu none"
+ }
*** /dev/null   Thu Aug 30 21:30:55 2001
--- baseboards/sh-sid.exp       Sun Mar 10 23:09:32 2002
***************
*** 0 ****
--- 1,25 ----
+ # This is a list of toolchains that are supported on this board.
+ set_board_info target_install {sh-elf}
+ 
+ # Load a baseboard description for SID simulators.
+ load_base_board_description "basic-sid"
+ 
+ process_multilib_options ""
+ 
+ verbose "Using simulator [board_info $board sim]\n"
+ set_board_info sim [find_rawsid]
+ if { ${tool} == "gdb" } {
+     set_board_info sim,options "-f [find_sid_conf sh-gdb]"
+ } else {
+     set_board_info sim,options "-f [find_sid_conf sh-gloss]"
+ }
+ 
+ # Load the generic configuration for this board. This will define a basic set
+ # of routines needed by the tool to communicate with the board.
+ load_generic_config "sid"
+ 
+ # default endian: big
+ # set_board_info sim,defaultendian "-EB"
+ 
+ # Tells the test harness to use pre-generated sid configurations.
+ set_board_info sim,protocol "sid"
*** /dev/null   Thu Aug 30 21:30:55 2001
--- config/sid.exp      Sun Mar 10 23:09:32 2002
***************
*** 0 ****
--- 1,56 ----
+ # Routines for loading and running programs on a SID simulator.
+ # Written by Ben Elliston <address@hidden>.
+ 
+ # See default.exp for explanation of arguments and results.
+ 
+ load_generic_config "sim"
+ 
+ # Treat sid as a remote board
+ set_board_info use_gdb_stub 1
+ 
+ # The simulator doesn't return exit statuses and we need to indicate this;
+ # the standard GCC wrapper will work with this target.
+ set_board_info needs_status_wrapper  1
+ 
+ # Doesn't pass signals and can't return results.
+ set_board_info gdb,nosignals 1
+ set_board_info gdb,noresults 1
+ 
+ # Don't expect interrupts to work in gdb testsuite
+ proc set_host_info { entry value } {
+     global target_info board_info
+     verbose "set_host_info $entry $value" 3
+ 
+     set machine host
+     if [info exists target_info($machine,name)] {
+         set machine $target_info($machine,name);
+     }
+     set board_info($machine,$entry) $value
+ }
+ set_host_info gdb,nointerrupts 1
+ 
+ # Cannot pass command line arguments
+ set_board_info noargs 1
+ 
+ # Configure TCP/IP connection to sid
+ set_board_info connect telnet
+ set_board_info netport localhost:[expr {3000 + [clock clicks] % 2000}]
+ set_board_info gdb,big_rx_buffers 1
+ set_board_info gdb_protocol "remote"
+ # ... or "async" or "extended-remote" or "extended-async"
+ 
+ # No multilib options needed by default.
+ process_multilib_options ""
+ 
+ # We only support newlib on this target. We assume that all multilib
+ # options have been specified before we get here.
+ 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 ""
+ 
+ # Additional sid options
+ # eg:
+ #
+ # set_board_info sim,options "--mksid"