Further fixes for ARM gas testsuite failures

Nick Clifton nickc@redhat.com
Fri Mar 4 15:27:00 GMT 2005


Hi Guys,

  I am applying the patch below to extend my fix to the arm.exp script
  to run a COFF variant of the undefined local label test so that it
  catches other non-ELF based ports.  The patch also fixes up a few
  unexpected failures for the arm-vxworks targets which does not
  handle relocs in quite the same way as the other arm targets.

Cheers
  Nick

gas/testsuite/ChangeLog
2005-03-04  Nick Clifton  <nickc@redhat.com>

	* gas/arm/arm.exp: Fix test for running the "undefined" to catch
	more non-ELF cases.
	* gas/arm/pic.d: Fix for vxworks target.
	* gas/arm/basic.d: Likewise.
	* gas/arm/unwind.d: Likewise.

Index: gas/testsuite/gas/arm/arm.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/arm.exp,v
retrieving revision 1.34
diff -c -3 -p -r1.34 arm.exp
*** gas/testsuite/gas/arm/arm.exp	1 Mar 2005 15:39:59 -0000	1.34
--- gas/testsuite/gas/arm/arm.exp	4 Mar 2005 15:24:41 -0000
*************** if {[istarget *arm*-*-*] || [istarget "x
*** 57,71 ****
      run_errors_test "armv1-bad" "-mcpu=arm7m" "ARM v1 errors"
      run_errors_test "r15-bad" "" "Invalid use of r15 errors"
  
!     if {[istarget *-*-*elf*] || [istarget *-*-linux*] || [istarget *-*-*eabi]} then {
          run_errors_test "undefined" "" "Undefined local label error"
  	run_dump_test "pic"
  	run_dump_test "mapping"
  	gas_test "bignum1.s" "" $stdoptlist "bignums"
  	run_dump_test "unwind"
-     } else {
- 	# COFF based ports use a different naming convention for local labels.
-        run_errors_test "undefined_coff" "" "Undefined local label error"
      }
  
      if {! [istarget arm*-*-aout] && ![istarget arm-*-pe]} then {
--- 57,74 ----
      run_errors_test "armv1-bad" "-mcpu=arm7m" "ARM v1 errors"
      run_errors_test "r15-bad" "" "Invalid use of r15 errors"
  
!     if {[istarget *-*-*coff] || [istarget *-*-pe] || [istarget *-*-wince] ||
!         [istarget *-*-*aout*] || [istarget *-*-netbsd] || [istarget *-*-riscix*]} then {
! 	# COFF and aout based ports use a different naming convention for local labels.
!        run_errors_test "undefined_coff" "" "Undefined local label error"
!    } else {
!        # For ELF based ports we can run some additional tests as well.
          run_errors_test "undefined" "" "Undefined local label error"
+        
  	run_dump_test "pic"
  	run_dump_test "mapping"
  	gas_test "bignum1.s" "" $stdoptlist "bignums"
  	run_dump_test "unwind"
      }
  
      if {! [istarget arm*-*-aout] && ![istarget arm-*-pe]} then {
Index: gas/testsuite/gas/arm/inst.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/inst.d,v
retrieving revision 1.13
diff -c -3 -p -r1.13 inst.d
*** gas/testsuite/gas/arm/inst.d	1 Mar 2005 15:18:44 -0000	1.13
--- gas/testsuite/gas/arm/inst.d	4 Mar 2005 15:24:41 -0000
*************** Disassembly of section .text:
*** 159,171 ****
  0+254 <[^>]*> e9c40300 ?	stmib	r4, {r8, r9}\^
  0+258 <[^>]*> ef123456 ?	swi	0x00123456
  0+25c <[^>]*> 2f000033 ?	swics	0x00000033
! 0+260 <[^>]*> ebfffffe ?	bl	0[0123456789abcdef]+ <[^>]*>
  [		]*260:.*_wombat.*
! 0+264 <[^>]*> 5bfffffe ?	blpl	0[0123456789abcdef]+ <[^>]*>
! [		]*264:.*ARM.*hohum
! 0+268 <[^>]*> eafffffe ?	b	0[0123456789abcdef]+ <[^>]*>
  [		]*268:.*_wibble.*
! 0+26c <[^>]*> dafffffe ?	ble	0[0123456789abcdef]+ <[^>]*>
  [		]*26c:.*testerfunc.*
  0+270 <[^>]*> e1a01102 ?	mov	r1, r2, lsl #2
  0+274 <[^>]*> e1a01002 ?	mov	r1, r2
--- 159,171 ----
  0+254 <[^>]*> e9c40300 ?	stmib	r4, {r8, r9}\^
  0+258 <[^>]*> ef123456 ?	swi	0x00123456
  0+25c <[^>]*> 2f000033 ?	swics	0x00000033
! 0+260 <[^>]*> eb...... ?	bl	0[0123456789abcdef]+ <[^>]*>
  [		]*260:.*_wombat.*
! 0+264 <[^>]*> 5b...... ?	blpl	0[0123456789abcdef]+ <[^>]*>
! [		]*264:.*ARM.*hohum.*
! 0+268 <[^>]*> ea...... ?	b	0[0123456789abcdef]+ <[^>]*>
  [		]*268:.*_wibble.*
! 0+26c <[^>]*> da...... ?	ble	0[0123456789abcdef]+ <[^>]*>
  [		]*26c:.*testerfunc.*
  0+270 <[^>]*> e1a01102 ?	mov	r1, r2, lsl #2
  0+274 <[^>]*> e1a01002 ?	mov	r1, r2
Index: gas/testsuite/gas/arm/pic.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/pic.d,v
retrieving revision 1.9
diff -c -3 -p -r1.9 pic.d
*** gas/testsuite/gas/arm/pic.d	1 Mar 2005 15:18:44 -0000	1.9
--- gas/testsuite/gas/arm/pic.d	4 Mar 2005 15:24:41 -0000
***************
*** 6,13 ****
  .*: +file format .*arm.*
  
  Disassembly of section .text:
! 00+0 <[^>]*> ebfffffe 	bl	00+0 <[^>]*>
! 			0: R_ARM_PC24	foo
  00+4 <[^>]*> ebfffffe 	bl	0[0123456789abcdef]+ <[^>]*>
  			4: R_ARM_PLT32	foo
  	\.\.\.
--- 6,13 ----
  .*: +file format .*arm.*
  
  Disassembly of section .text:
! 00+0 <[^>]*> eb...... 	bl	00+. <[^>]*>
! 			0: R_ARM_PC24	foo.*
  00+4 <[^>]*> ebfffffe 	bl	0[0123456789abcdef]+ <[^>]*>
  			4: R_ARM_PLT32	foo
  	\.\.\.
Index: gas/testsuite/gas/arm/unwind.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/unwind.d,v
retrieving revision 1.4
diff -c -3 -p -r1.4 unwind.d
*** gas/testsuite/gas/arm/unwind.d	10 Feb 2005 12:39:17 -0000	1.4
--- gas/testsuite/gas/arm/unwind.d	4 Mar 2005 15:24:41 -0000
*************** OFFSET   TYPE              VALUE 
*** 14,26 ****
  RELOCATION RECORDS FOR \[.ARM.exidx\]:
  OFFSET   TYPE              VALUE 
  00000000 R_ARM_PREL31      .text
! 00000008 R_ARM_PREL31      .text
  0000000c R_ARM_PREL31      .ARM.extab
! 00000010 R_ARM_PREL31      .text
! 00000014 R_ARM_PREL31      .ARM.extab
! 00000018 R_ARM_PREL31      .text
! 0000001c R_ARM_PREL31      .ARM.extab
! 00000020 R_ARM_PREL31      .text
  
  
  Contents of section .text:
--- 14,26 ----
  RELOCATION RECORDS FOR \[.ARM.exidx\]:
  OFFSET   TYPE              VALUE 
  00000000 R_ARM_PREL31      .text
! 00000008 R_ARM_PREL31      .text.*
  0000000c R_ARM_PREL31      .ARM.extab
! 00000010 R_ARM_PREL31      .text.*
! 00000014 R_ARM_PREL31      .ARM.extab.*
! 00000018 R_ARM_PREL31      .text.*
! 0000001c R_ARM_PREL31      .ARM.extab.*
! 00000020 R_ARM_PREL31      .text.*
  
  
  Contents of section .text:



More information about the Binutils mailing list