Merge GDB 7.5.1

gdb/testsuite/gdb.asm/asm-source.exp

 # Copyright 1998, 2000-2004, 2007-2012 Free Software Foundation, Inc.
 # 
 # This program 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.
 #
 # This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This file was written by Kendra.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 #
 # Test debugging assembly level programs.
 # This file uses asmsrc[12].s for input.
 #
 
 
 set asm-arch ""
 set asm-note "empty"
 set asm-flags ""
 set link-flags "-e _start"
 set debug-flags ""
 
+set obj_include -I[standard_output_file {}]
+
 switch -glob -- [istarget] {
     "alpha*-*-*" {
         set asm-arch alpha
         # ??? Won't work with ecoff systems like Tru64, but then we also
         # don't have any other -g flag that creates mdebug output.
-        set asm-flags "-no-mdebug -I${srcdir}/${subdir} -I${objdir}/${subdir}"
+        set asm-flags "-no-mdebug -I${srcdir}/${subdir} $obj_include"
         set debug-flags "-gdwarf-2"
     }
     "arm*-*-*" {
         set asm-arch arm
     }
     "bfin-*-*" {
         set asm-arch bfin
     }
     "frv-*-*" {
         set asm-arch frv
@@ skipping 19 matching lines @@
     }
     "m32c-*-*" {
         set asm-arch m32c
     }
     "m32r*-*" {
         set asm-arch m32r
         append link-flags "--whole-archive -lgloss --no-whole-archive"
     }
     "m6811-*-*" {
         set asm-arch m68hc11
-        set asm-flags "-mshort-double -m68hc11 --no-warn -I${srcdir}/${subdir} -I${objdir}/${subdir}"
+        set asm-flags "-mshort-double -m68hc11 --no-warn -I${srcdir}/${subdir} $obj_include"
         set debug-flags "-gdwarf-2"
         # This asm test is specific and uses the linker directly.
         # We must not use the target board linker script defined for other
         # tests.  Remove it and restore it later on.
         set board [target_info name]
         set old_ldscript [board_info $board ldscript]
         unset_board_info "ldscript"
     }
     "m6812-*-*" {
         set asm-arch m68hc11
-        set asm-flags "-mshort-double -m68hc12 --no-warn -I${srcdir}/${subdir} -I${objdir}/${subdir}"
+        set asm-flags "-mshort-double -m68hc12 --no-warn -I${srcdir}/${subdir} $obj_include"
         set debug-flags "-gdwarf-2"
         # This asm test is specific and uses the linker directly.
         # We must not use the target board linker script defined for other
         # tests.  Remove it and restore it later on.
         set board [target_info name]
         set old_ldscript [board_info $board ldscript]
         set_board_info ldscript ""
     }
     "mips*-*" {
         set asm-arch mips
     }
     "powerpc*-*" {
         if { [is_lp64_target] } {
             set asm-arch powerpc64
-            set asm-flags "-a64 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
+            set asm-flags "-a64 -I${srcdir}/${subdir} $obj_include"
             append link-flags " -m elf64ppc"
         } else {
             set asm-arch powerpc
-            set asm-flags "-a32 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
+            set asm-flags "-a32 -I${srcdir}/${subdir} $obj_include"
             append link-flags " -m elf32ppc"
         }
     }
     "sh*-*-*" {
         set asm-arch sh
         set debug-flags "-gdwarf-2"
     }
     "sparc-*-*" {
         set asm-arch sparc
     }
     "sparc64-*-*" {
         set asm-arch sparc64
-        set asm-flags "-xarch=v9 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
+        set asm-flags "-xarch=v9 -I${srcdir}/${subdir} $obj_include"
         set debug-flags "-gdwarf-2"
     }
     "spu*-*-*" {
        set asm-arch spu
-       set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir} --no-warn"
+       set asm-flags "-I${srcdir}/${subdir} $obj_include --no-warn"
        set debug-flags "-gdwarf-2"
     }
     "xstormy16-*-*" {
         set asm-arch xstormy16
         set debug-flags "-gdwarf-2"
     }
     "v850-*-*" {
         set asm-arch v850
         set gdb_wrapper_initialized 1
     }
@@ skipping 55 matching lines @@
 set dest [target_info name]
 if [board_info $dest exists multilib_flags] {
         set multilib_flags [board_info $dest multilib_flags]
         if { "${multilib_flags}" != "" } {
            untested asm-source.exp
            return -1
            return;
          }
 }
 
-set testfile "asm-source"
-set binfile ${objdir}/${subdir}/${testfile}
-set srcfile1 asmsrc1.s
-set srcfile2 asmsrc2.s
+standard_testfile asmsrc1.s asmsrc2.s
 
 remote_exec build "rm -f ${subdir}/arch.inc"
 remote_download host ${srcdir}/${subdir}/${asm-arch}.inc ${subdir}/arch.inc
 remote_exec build "rm -f ${subdir}/note.inc"
 remote_download host ${srcdir}/${subdir}/${asm-note}.inc ${subdir}/note.inc
 
 if { [string equal ${asm-flags} ""] } {
-    set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
+    set asm-flags "-I${srcdir}/${subdir} $obj_include"
 }
 
 if { [string equal ${debug-flags} ""] } {
     set debug-flags "-gstabs"
 }
 
 # Allow the target board to override the debug flags.
 if { [board_info $dest exists debug_flags] } then {
     set debug-flags "[board_info $dest debug_flags]"
 }
@@ skipping 11 matching lines @@
 
 # The GNU assembler spells "dwarf-2" as "dwarf2".
 regsub "--" "-gdwarf-2" "${debug-flags}" "-gdwarf2" debug-flags
 
 # The GNU assembler before 2.15 did not support "stabs+".
 regsub "--" "-gstabs\[+\]" "${debug-flags}" "-gstabs" debug-flags
 
 # The GNU assembler does not support level options like "-g2" or "-g3".
 regsub "--" "-g\[0-9\]" "${debug-flags}" "" debug-flags
 
-if {[target_assemble ${srcdir}/${subdir}/${srcfile1} asmsrc1.o "${asm-flags} ${debug-flags}"] != ""} then {
+set asm1obj [standard_output_file asmrc1.o]
+set asm2obj [standard_output_file asmrc2.o]
+
+if {[target_assemble ${srcdir}/${subdir}/${srcfile} $asm1obj "${asm-flags} ${debug-flags}"] != ""} then {
      untested asm-source.exp
      return -1
 }
-if {[target_assemble ${srcdir}/${subdir}/${srcfile2} asmsrc2.o "${asm-flags} ${debug-flags}"] != ""} then {
+if {[target_assemble ${srcdir}/${subdir}/${srcfile2} $asm2obj "${asm-flags} ${debug-flags}"] != ""} then {
      untested asm-source.exp
      return -1
 }
 
 # We deliberately don't use gdb_compile here to link together the
 # assembled object files.  Using gdb_compile, and therefore the C
 # compiler, is conceptually wrong, since we're testing raw assembler
 # code here that provides its own startup code.  Using target_link
 # also avoids a lot of problems on many systems, most notably on
 # *-*-*bsd* and *-*-solaris2*.
-if {[target_link "asmsrc1.o asmsrc2.o" "${binfile}" ${link-flags}] != "" } then {
+if {[target_link [list $asm1obj $asm2obj] "${binfile}" ${link-flags}] != "" } then {
      untested asm-source.exp
      return -1
 }
 
 # Restore the target board linker script for HC11/HC12.
 if { [istarget "m6811-*-*"] || [istarget "m6812-*-*"] } {
     set_board_info ldscript $old_ldscript
 }
 
-remote_exec build "mv asmsrc1.o asmsrc2.o ${objdir}/${subdir}"
-
 # Collect some line numbers.
 set line_main       [expr [gdb_get_line_number "main start" "asmsrc1.s"] + 1]
 set line_call_foo2  [expr [gdb_get_line_number "call foo2"  "asmsrc1.s"] + 1]
 set line_search_comment [expr [gdb_get_line_number "search" "asmsrc1.s"] + 1]
 set line_foo3       [expr [gdb_get_line_number "foo3 start" "asmsrc1.s"] + 1]
 set line_main_exit  [expr [gdb_get_line_number "main exit"  "asmsrc1.s"] + 1]
 set line_foo2       [expr [gdb_get_line_number "foo2 start" "asmsrc2.s"] + 1]
 set line_call_foo3  [expr [gdb_get_line_number "call foo3"  "asmsrc2.s"] + 1]
 set line_call_foo3_again [expr $line_call_foo3 + 1]
 set line_foo2_leave [expr [gdb_get_line_number "foo2 leave" "asmsrc2.s"] + 1]
@@ skipping 183 matching lines @@
 gdb_test "print staticvar" ".* = 5" "look at static variable"
 test_dis "x/i &staticvar" "staticvar"
 test_dis "disassem &staticvar, &staticvar+1" "staticvar"
 
 # See if we can look at a static function
 gdb_test "disassem foostatic" ".*<\\+0>:.*End of assembler dump." \
         "look at static function"
 
 remote_exec build "rm -f ${subdir}/arch.inc"
 remote_exec build "rm -f ${subdir}/note.inc"