RFA/RFC: Change Sparc64 gdb.asm tests to use -gdwarf2 instead of -gstabs

RFA/RFC: Change Sparc64 gdb.asm tests to use -gdwarf2 instead of -gstabs

[Nick Clifton]

Hi Guys,

  I would like permission to apply the following patch.  It changes
  the switch used to generate debugging information for Sparc64
  targets from -gstabs to -gdwarf2.

  This patch might be controversial however since although DWARF2 is a
  more modern debug format when compared to STABS, there is also a
  second motive for the change: GAS does not generate correct relocs
  for Sparc64 STABS debug information.  So this patch works around a
  known failure in GAS, which means that possibly the problem might be
  forgotten.

Cheers
    Nick

gdb/testsuite/ChangeLog
2004-07-26  Nick Clifton  <nickc@redhat.com>

	* gdb.asm/asm-source.exp: Use -gdwarf2 in preference to
	-gstabs for Sparc64.

Index: gdb/testsuite/gdb.asm/asm-source.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.asm/asm-source.exp,v
retrieving revision 1.50
diff -c -3 -p -r1.50 asm-source.exp
*** gdb/testsuite/gdb.asm/asm-source.exp	25 May 2004 04:07:05 -0000	1.50
--- gdb/testsuite/gdb.asm/asm-source.exp	26 Jul 2004 12:53:52 -0000
*************** switch -glob -- [istarget] {
*** 95,101 ****
      }
      "sparc64-*-*" {
          set asm-arch sparc64
!         set asm-flags "-xarch=v9 -gstabs -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "xstormy16-*-*" {
          set asm-arch xstormy16
--- 95,101 ----
      }
      "sparc64-*-*" {
          set asm-arch sparc64
!         set asm-flags "-xarch=v9 -gdwarf2 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "xstormy16-*-*" {
          set asm-arch xstormy16
  

Re: RFA/RFC: Change Sparc64 gdb.asm tests to use -gdwarf2 instead of -gstabs

[Michael Chastain]

Not approved.

You stepped into one of the test suite cow pies ... sorry about that.

Instead of hard-wiring the debug format, the test should use the
value of debug_flags.  Copy this bit of code from lib/ada.exp
(which was copied from default_target_compile):

  set dest [target_info name]
  if [board_info $dest exists debug_flags] {
    append add_flags " [board_info $dest debug_flags]";
  } else {
    append add_flags " -g"
  }

For asm-source.exp it would be more like:

  switch --glob -- [istarget] {
    "alpha*-*-*" {
      set asm-arch alpha
      set asm-flags "-no-mdebug -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      set debug-flags "-gdwarf-2"
    }
    ...
  }

  # Override the flags for this target board.
  set dest [target_info name]
  if { [board_info $dest exists debug_flags] } then {
    set debug_flags "board_info $dest debug_flags"
  }
  if { $debug_flags == "stabs+" } then {
    # GNU assembler does not support stabs+
    set debug_flags "stabs"
  }
  ...
  set asm-flags "$debug_flags $asm-flags"

Or something like that.  The point is to honor debug_flags.  This is the
same mechanism that C, C++, and Ada use to select which debug format to
test.

I run my test bed with both dwarf-2 and stabs+, just by supplying
the right flags to runtest (see below).

It would be nice if the assembler supported "-g" with a good default
value.  But it doesn't.  So we have to keep all the existing
per-architecture code to choose between -gdwarf-2 and -gstabs, with the
override at the end.

Also ... how did this ever work on sparc64 with stabs?  I thought that
stabs and stabs+ have never worked on 64-bit machines!  Am I missing a
clue?

nick> So this patch works around a known failure in GAS, which means that
nick> possibly the problem might be forgotten.

It's okay to pick whatever makes the most sense for the default.
gcc picks dwarf-2 so dwarf-2 is fine.  It's the tester's job
to test with all the supported debug formats.  That person would
file a bug report against gas -gstabs, and then the gas maintainers
would fix it, laugh at it, or whatever.

If there is a bug report filed for the bug, then the test can
return XFAIL or KFAIL with the PR number (XFAIL for a PR against
the assembler, KFAIL for a PR against gdb).

Lastly, you have to test the patch, and say how you tested it
(obviously by running asm-source.exp on a sparc64).
Please test with all three of:

  runtest
  runtest --target_board unix/gdb:debug_flags=dwarf-2
  runtest --target_board unix/gdb:debug_flags=stabs+

Whew.  If you want me to do the boring mechanical $debug_flags part
first, and then you just flip the switch on the default and run
the sparc64 tests, I'm up for that.  Or you can do the boring
mechanical part if you want.

Michael C

===

2004-07-26  Nick Clifton  <nickc@redhat.com>

	* gdb.asm/asm-source.exp: Use -gdwarf2 in preference to
	-gstabs for Sparc64.

Re: RFA/RFC: Change Sparc64 gdb.asm tests to use -gdwarf2 instead of -gstabs

[Nick Clifton]

[-- Attachment #1: Type: text/plain, Size: 2942 bytes --]

Hi Michael,

> Not approved.
*sob* :-)

> You stepped into one of the test suite cow pies ... sorry about that.
> 
> Instead of hard-wiring the debug format, the test should use the
> value of debug_flags.  Copy this bit of code from lib/ada.exp
> (which was copied from default_target_compile):

Cool - I have adapted your suggested code slightly (see attached patch).

> It would be nice if the assembler supported "-g" with a good default
> value.  But it doesn't.  So we have to keep all the existing
> per-architecture code to choose between -gdwarf-2 and -gstabs, with the
> override at the end.

Those darn lazy binutils maintainers.  What do they think that they are 
doing ?  Oh wait, I am binutils maintainer.  :-) Guess I should look 
into this...

> Also ... how did this ever work on sparc64 with stabs?  I thought that
> stabs and stabs+ have never worked on 64-bit machines!  Am I missing a
> clue?

Ah well now that I cannot answer.  I just came into the middle of this, 
trying to answer my manager's question of "are these testsuite failures 
significant ?"  I do not know if Sparc64 + STABS has ever worked, but I 
assumed that since it was explicitly set that way in asm-source.exp that 
somebody, in the past, has thought that it did work.

> If there is a bug report filed for the bug, then the test can
> return XFAIL or KFAIL with the PR number (XFAIL for a PR against
> the assembler, KFAIL for a PR against gdb).

AFAIK there is no such bug report.  Although there is a related one 
about the generation of aligned and unaligned relocs for the Sparc.

> Lastly, you have to test the patch, and say how you tested it
> (obviously by running asm-source.exp on a sparc64).
> Please test with all three of:
> 
>   runtest
>   runtest --target_board unix/gdb:debug_flags=dwarf-2
>   runtest --target_board unix/gdb:debug_flags=stabs+

OK I ran those tests, although I changed the flags to be "-gdwarf2" and 
"-gstabs+".  I also added "gdb.asm/asm-source.exp" to the command lines, 
since I assumed that it was OK to just run the assembler tests.  The 
patch does not affect any other part of the GDB testsuite.

I ran the tests on an x86 native host and a Sparc64 native host, just to 
make sure that the default selection code worked as well.  There was 
only one combination that produced any failures:

   Sparc64 native with -gstabs+

Which of course was the whole point of this patch in the first place. 
So - can I apply this version of the patch please ?

Cheers
   Nick

gdb/testsuite/ChangeLog
2004-07-26  Nick Clifton  <nickc@redhat.com>

	* gdb.asm/asm-source.exp (debug-flags): New variable.  If a
	known good default value for a specific architecture is
	available then set it to that value.  Otherwise default to the
	-gstabs switch.  Remove the -g... switches from the asm-flags
	variable.  Allow the target board info to override the value if
	it wants to.  Pass the switch on the assembler command line.

[-- Attachment #2: asm-source.exp.patch --]
[-- Type: text/plain, Size: 5433 bytes --]

Index: gdb/testsuite/gdb.asm/asm-source.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.asm/asm-source.exp,v
retrieving revision 1.50
diff -c -3 -p -r1.50 asm-source.exp
*** gdb/testsuite/gdb.asm/asm-source.exp	25 May 2004 04:07:05 -0000	1.50
--- gdb/testsuite/gdb.asm/asm-source.exp	26 Jul 2004 17:14:38 -0000
*************** set asm-arch ""
*** 35,47 ****
  set asm-note "empty"
  set asm-flags ""
  set link-flags "--entry _start"
  
  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 "-gdwarf2 -no-mdebug -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "*arm-*-*" {
          set asm-arch arm
--- 35,49 ----
  set asm-note "empty"
  set asm-flags ""
  set link-flags "--entry _start"
+ set debug-flags ""
  
  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 debug-flags "-gdwarf-2"
      }
      "*arm-*-*" {
          set asm-arch arm
*************** switch -glob -- [istarget] {
*** 63,69 ****
      }
      "x86_64-*-*" {
          set asm-arch x86_64
!         set asm-flags "-gdwarf2 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "i\[3456\]86-*-*" {
          set asm-arch i386
--- 65,72 ----
      }
      "x86_64-*-*" {
          set asm-arch x86_64
!         set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf-2"
      }
      "i\[3456\]86-*-*" {
          set asm-arch i386
*************** switch -glob -- [istarget] {
*** 88,105 ****
      }
      "sh*-*-*" {
          set asm-arch sh
!         set asm-flags "-gdwarf2 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "sparc-*-*" {
          set asm-arch sparc
      }
      "sparc64-*-*" {
          set asm-arch sparc64
!         set asm-flags "-xarch=v9 -gstabs -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "xstormy16-*-*" {
          set asm-arch xstormy16
!         set asm-flags "-gdwarf2 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "v850-*-*" {
          set asm-arch v850
--- 91,111 ----
      }
      "sh*-*-*" {
          set asm-arch sh
!         set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	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 debug-flags "-gdwarf-2"
      }
      "xstormy16-*-*" {
          set asm-arch xstormy16
!         set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf-2"
      }
      "v850-*-*" {
          set asm-arch v850
*************** switch -glob -- [istarget] {
*** 110,120 ****
      }
      "ia64-*-*" {
          set asm-arch ia64
!         set asm-flags "-gdwarf2 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
      "hppa*-linux-*" {
          set asm-arch pa
!         set asm-flags "-gdwarf2 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
      }
  }
  
--- 116,128 ----
      }
      "ia64-*-*" {
          set asm-arch ia64
!         set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf-2"
      }
      "hppa*-linux-*" {
          set asm-arch pa
!         set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf-2"
      }
  }
  
*************** remote_exec build "rm -f ${subdir}/note.
*** 161,173 ****
  remote_download host ${srcdir}/${subdir}/${asm-note}.inc ${subdir}/note.inc
  
  if { "${asm-flags}" == "" } {
!     set asm-flags "-gstabs -I${srcdir}/${subdir} -I${objdir}/${subdir}"
  }
  
! if {[target_assemble ${srcdir}/${subdir}/${srcfile1} asmsrc1.o "${asm-flags}"] != ""} then {
       gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
  }
! if {[target_assemble ${srcdir}/${subdir}/${srcfile2} asmsrc2.o "${asm-flags}"] != ""} then {
       gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
  }
  
--- 169,192 ----
  remote_download host ${srcdir}/${subdir}/${asm-note}.inc ${subdir}/note.inc
  
  if { "${asm-flags}" == "" } {
!     set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
!     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."
  }
! if {[target_assemble ${srcdir}/${subdir}/${srcfile2} asmsrc2.o "${asm-flags} ${debug-flags}"] != ""} then {
       gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
  }
  

Re: RFA/RFC: Change Sparc64 gdb.asm tests to use -gdwarf2 instead of -gstabs

[Michael Chastain]

All right!  This patch is approved.

> AFAIK there is no such bug report.  Although there is a related one 
> about the generation of aligned and unaligned relocs for the Sparc.

Then the test can continue to FAIL until someone files a bug report
for it, or just fixes it, or maybe makes it UNSUPPORTED.  That's okay.

> OK I ran those tests, although I changed the flags to be "-gdwarf2" and 
> "-gstabs+".  I also added "gdb.asm/asm-source.exp" to the command lines, 
> since I assumed that it was OK to just run the assembler tests.  The 
> patch does not affect any other part of the GDB testsuite.

Err right, my sample code was bad.  Yeah, it's okay to just test
asm-source.exp.

> I ran the tests on an x86 native host and a Sparc64 native host, just to 
> make sure that the default selection code worked as well.  There was 
> only one combination that produced any failures:
>
>    Sparc64 native with -gstabs+

Beautiful, that's what I'm looking for.

Now the next poor hacker who ventures into asm-source.exp will have
something to read when they say "what is this ... let me check the
mailing list archives ...".

Michael C

===

2004-07-26  Nick Clifton  <nickc@redhat.com>

	* gdb.asm/asm-source.exp (debug-flags): New variable.  If a
	known good default value for a specific architecture is
	available then set it to that value.  Otherwise default to the
	-gstabs switch.  Remove the -g... switches from the asm-flags
	variable.  Allow the target board info to override the value if
	it wants to.  Pass the switch on the assembler command line.

Re: RFA/RFC: Change Sparc64 gdb.asm tests to use -gdwarf2 instead of -gstabs

[Mark Kettenis]

   Date: Mon, 26 Jul 2004 19:55:49 -0400
   From: Michael Chastain <mec.gnu@mindspring.com>

   All right!  This patch is approved.

Not all right!  Nick, did you actually test this patch?  The subject
of this thread is making sparc64 use -gdwarf2 instead of -gstabs, but
the patch changes it to -gdwarf-2 (note the extra dash).  This isn't
accepted by gas on my OpenBSD/amd64 and OpenBSD/sparc64 systems, and
AFAICT it isn't accepted by the current gas from CVS either.

Mark

Re: RFA/RFC: Change Sparc64 gdb.asm tests to use -gdwarf2 instead of -gstabs

[Michael Chastain]

Mark Kettenis <kettenis@chello.nl> wrote:
> Not all right!  Nick, did you actually test this patch?

Yes, he did.

If you keep reading the thread, you can see that I asked Nick to
test with "dwarf-2" and "stabs+", and Nick actually tested with
"dwarf2" and "stabs+" (which source.exp translates to "stabs").
But it looks like Nick's tests did not actually test.  :(

> The subject of this thread is making sparc64 use -gdwarf2 instead of
> -gstabs, but > the patch changes it to -gdwarf-2 (note the extra
> dash).  This isn't accepted by gas on my OpenBSD/amd64 and
> OpenBSD/sparc64 systems, and AFAICT it isn't accepted by the current
> gas from CVS either.

Hmmm.  Ick.  You're right.  Nick tested with "dwarf2" on the command
line, but the patch says "dwarf-2" embedded in the code.  And
the assembler spells "dwarf2" differently from gcc, which spells
it "dwarf-2".  And to make matters more confusing, old assemblers
do not understand "stabs+", but as 2.15 does support stabs+ with
new extensions.

For dwarf-2, I'd like to spell it the same way everywhere, and
translate it at the last moment for binutils.  That way, people
can run the test suite with:

  make check RUNTESTFLAGS="--target_board unix/gdb:debug_flags=dwarf-2"

... and will get dwarf-2 with all languages.

Like this:

  # The GNU assembler spells dwarf-2 as "dwarf2".
  if { ${debug-flags} == "-gdwarf-2" } then {
    set debug-flags "-gdwarf2"
  }

Mark, does that work on your system?

I'll test it on my system later tonight.

Michael C

Re: RFA/RFC: Change Sparc64 gdb.asm tests to use -gdwarf2 instead of -gstabs

[Mark Kettenis]

   Date: Thu, 29 Jul 2004 19:38:35 -0400
   From: Michael Chastain <mec.gnu@mindspring.com>

   Mark, does that work on your system?

Yup.  BTW, there are still some -gdwarf2's left in asm-source.exp
(m6811 and m6812).

Cheers,

Mark

Re: RFA/RFC: Change Sparc64 gdb.asm tests to use -gdwarf2 instead of -gstabs

[Nick Clifton]

[-- Attachment #1: Type: text/plain, Size: 1096 bytes --]

Hi Mark,

> Not all right!  Nick, did you actually test this patch?  The subject
> of this thread is making sparc64 use -gdwarf2 instead of -gstabs, but
> the patch changes it to -gdwarf-2 (note the extra dash).  This isn't
> accepted by gas on my OpenBSD/amd64 and OpenBSD/sparc64 systems, and
> AFAICT it isn't accepted by the current gas from CVS either.

I did test the patch - but unfortuntately I tested is against a GAS 
built from the CVS sources with a few, work-in-progress, modifications 
of my own applied - including one that supports -gdwarf-2 so that GAS 
would be consistent with the same switches supported by GCC.

I am very sorry about this mistake - I should have used a pristeen 
version of GAS.

I would like to apply the patch below to rectify this problem.  Tested 
with an x86 native host and an sh-elf cross compiler.  Is this OK ?

Cheers
   Nick

gdb/testsuite/ChangeLog
2004-07-30  Nick Clifton  <nickc@redhat.com>

	* gdb.asm/asm-source.exp: Fix typo in previous delta: gdwarf-2
	-> gdwarf2.
	Move -gdwarf2 switch from asm-flags to debug-flags for m6811 and
	m6812.

[-- Attachment #2: asm-source.exp.patch --]
[-- Type: text/plain, Size: 4504 bytes --]

Index: gdb/testsuite/gdb.asm/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
*** gdb/testsuite/gdb.asm/asm-source.exp	27 Jul 2004 09:28:42 -0000	1.51
--- gdb/testsuite/gdb.asm/asm-source.exp	30 Jul 2004 11:47:53 -0000
*************** switch -glob -- [istarget] {
*** 43,49 ****
  	# ??? 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 debug-flags "-gdwarf-2"
      }
      "*arm-*-*" {
          set asm-arch arm
--- 43,49 ----
  	# ??? 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 debug-flags "-gdwarf2"
      }
      "*arm-*-*" {
          set asm-arch arm
*************** switch -glob -- [istarget] {
*** 66,72 ****
      "x86_64-*-*" {
          set asm-arch x86_64
          set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf-2"
      }
      "i\[3456\]86-*-*" {
          set asm-arch i386
--- 66,72 ----
      "x86_64-*-*" {
          set asm-arch x86_64
          set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf2"
      }
      "i\[3456\]86-*-*" {
          set asm-arch i386
*************** 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,89 ----
      }
      "m6811-*-*" {
          set asm-arch m68hc11
!         set asm-flags "-mshort-double -m68hc11 --no-warn -I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf2"
      }
      "m6812-*-*" {
          set asm-arch m68hc11
!         set asm-flags "-mshort-double -m68hc12 --no-warn -I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf2"
      }
      "mips*-*" {
          set asm-arch mips
*************** switch -glob -- [istarget] {
*** 92,98 ****
      "sh*-*-*" {
          set asm-arch sh
          set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf-2"
      }
      "sparc-*-*" {
          set asm-arch sparc
--- 94,100 ----
      "sh*-*-*" {
          set asm-arch sh
          set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf2"
      }
      "sparc-*-*" {
          set asm-arch sparc
*************** switch -glob -- [istarget] {
*** 100,111 ****
      "sparc64-*-*" {
          set asm-arch sparc64
          set asm-flags "-xarch=v9 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf-2"
      }
      "xstormy16-*-*" {
          set asm-arch xstormy16
          set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf-2"
      }
      "v850-*-*" {
          set asm-arch v850
--- 102,113 ----
      "sparc64-*-*" {
          set asm-arch sparc64
          set asm-flags "-xarch=v9 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf2"
      }
      "xstormy16-*-*" {
          set asm-arch xstormy16
          set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf2"
      }
      "v850-*-*" {
          set asm-arch v850
*************** switch -glob -- [istarget] {
*** 117,128 ****
      "ia64-*-*" {
          set asm-arch ia64
          set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf-2"
      }
      "hppa*-linux-*" {
          set asm-arch pa
          set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf-2"
      }
  }
  
--- 119,130 ----
      "ia64-*-*" {
          set asm-arch ia64
          set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf2"
      }
      "hppa*-linux-*" {
          set asm-arch pa
          set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
! 	set debug-flags "-gdwarf2"
      }
  }