This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[rfc/testsuite] asm-source.exp: convert debug_flags


Okay, how about this?

I added a comment that debug_flags is in the format that gcc expects,
and that the test script adjusts to the format that the assembler
expects.

Also I strip out "-g2" and "-g3" because as soon as I ran my testbed
I noticed that my testbed provides those.

Tested on native i686-pc-linux-gnu with gcc 3.3.4 and binutils 2.15
with the following flags:

  make check RUNTESTFLAGS="asm-source.exp"
  make check RUNTESTFLAGS="--target_board=unix/gdb:debug_flags=-gdwarf-2 asm-source.exp"
  make check RUNTESTFLAGS="--target_board=unix/gdb:debug_flags=-gdwarf2 asm-source.exp"
  make check RUNTESTFLAGS="--target_board=unix/gdb:debug_flags=-gstabs+ asm-source.exp"
  make check RUNTESTFLAGS="--target_board=unix/gdb:debug_flags=-gstabs asm-source.exp"
  make check RUNTESTFLAGS="--target_board=unix/gdb:debug_flags=-gstabs+\\\\\\ -g2 asm-source.exp"
  make check RUNTESTFLAGS="--target_board=unix/gdb:debug_flags=-g3\\\\\\ -gdwarf-2 asm-source.exp"

Mark, does this patch work for you too?  If it does, I'll commit it.

Michael C

2004-07-29  Michael Chastain  <mec.gnu@mindspring.com>

	* gdb.base/asm-source.exp: Properly convert target board
	debug flags from gcc format to binutils format.

Index: asm-source.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.asm/asm-source.exp,v
retrieving revision 1.51
diff -c -3 -p -r1.51 asm-source.exp
*** asm-source.exp	27 Jul 2004 09:28:42 -0000	1.51
--- asm-source.exp	30 Jul 2004 05:57:33 -0000
*************** switch -glob -- [istarget] {
*** 77,87 ****
      }
      "m6811-*-*" {
          set asm-arch m68hc11
!         set asm-flags "-mshort-double -m68hc11 -gdwarf2 --no-warn -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "m6812-*-*" {
          set asm-arch m68hc11
!         set asm-flags "-mshort-double -m68hc12 -gdwarf2 --no-warn -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "mips*-*" {
          set asm-arch mips
--- 77,87 ----
      }
      "m6811-*-*" {
          set asm-arch m68hc11
!         set asm-flags "-mshort-double -m68hc11 -gdwarf-2 --no-warn -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "m6812-*-*" {
          set asm-arch m68hc11
!         set asm-flags "-mshort-double -m68hc12 -gdwarf-2 --no-warn -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "mips*-*" {
          set asm-arch mips
*************** if { "${asm-flags}" == "" } {
*** 173,187 ****
      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]"
  }
  
! # The GNU assembler does not support STABS+
! if { ${debug-flags} == "-gstabs+" } then {
!     set debug-flags "-gstabs"
! }
  
  if {[target_assemble ${srcdir}/${subdir}/${srcfile1} asmsrc1.o "${asm-flags} ${debug-flags}"] != ""} then {
       gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
--- 173,202 ----
      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]"
  }
  
! # The debug flags are in the format that gcc expects:
! # "-gdwarf-2", "-gstabs+", or "-gstabs".  To be compatible with the
! # other languages in the test suite, we accept this input format.
! # So the user can run the test suite with:
! #
! #   runtest --target_board unix/gdb:debug_flags=-gdwarf-2
! #   make check RUNTESTFLAGS="--target_board unix/gdb:debug_flags=-gdwarf-2"
! #
! # However, the GNU assembler has different spellings than gcc.
! # So I adjust the debug flags here.
! 
! # 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 {
       gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]