diff options
author | Dave Anglin <dave.anglin@nrc.ca> | 2005-11-25 02:08:22 +0000 |
---|---|---|
committer | Dave Anglin <dave.anglin@nrc.ca> | 2005-11-25 02:08:22 +0000 |
commit | b70b22ce48ad82c172441b3db2f808ed7178a2f4 (patch) | |
tree | 55684976f4298d1daa6a05d5024d50b61ea0636c /gas/testsuite | |
parent | feed9874a582f7d45cca28c1a67af51c65dc3eff (diff) | |
download | binutils-redhat-b70b22ce48ad82c172441b3db2f808ed7178a2f4.tar.gz |
Bug gas/1896
* config/tc-hppa.c (hppa_fix_adjustable): Don't reject for reduction
R_HPPA relocations that are 32-bits wide.
* gas/all/redef2.d: Allow "$DATA$" as well as ".data" in matches.
* gas/all/weakref1.d: Allow "$CODE$" as well as ".text" in matches.
* gas/hppa/reloc/reloc.exp: Adjust regexp for new output.
Diffstat (limited to 'gas/testsuite')
-rw-r--r-- | gas/testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | gas/testsuite/gas/all/redef2.d | 4 | ||||
-rw-r--r-- | gas/testsuite/gas/all/weakref1.d | 20 | ||||
-rw-r--r-- | gas/testsuite/gas/hppa/reloc/reloc.exp | 6 |
4 files changed, 22 insertions, 15 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index a2a665e90b..ea982efecd 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2005-11-24 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + Bug gas/1896 + * gas/all/redef2.d: Allow "$DATA$" as well as ".data" in matches. + * gas/all/weakref1.d: Allow "$CODE$" as well as ".text" in matches. + * gas/hppa/reloc/reloc.exp: Adjust regexp for new output. + 2005-11-23 Daniel Jacobowitz <dan@codesourcery.com> Thiemo Seufer <ths@networkno.de> diff --git a/gas/testsuite/gas/all/redef2.d b/gas/testsuite/gas/all/redef2.d index 328f7e5753..244d33dd68 100644 --- a/gas/testsuite/gas/all/redef2.d +++ b/gas/testsuite/gas/all/redef2.d @@ -5,9 +5,9 @@ RELOCATION RECORDS FOR .* .* -0+00.*(here|\.data) +0+00.*(here|\.data|\$DATA\$) 0+08.*xtrn -0+10.*(sym|\.data(\+0x0+10)?) +0+10.*(sym|(\.data|\$DATA\$)(\+0x0+10)?) #... Contents of section (\.data|\$DATA\$): 0000 00000000 11111111 00000000 22222222[ ]+................[ ]* diff --git a/gas/testsuite/gas/all/weakref1.d b/gas/testsuite/gas/all/weakref1.d index dadd280033..ee37d97700 100644 --- a/gas/testsuite/gas/all/weakref1.d +++ b/gas/testsuite/gas/all/weakref1.d @@ -83,14 +83,14 @@ OFFSET +TYPE +VALUE * [0-9a-f]+ [^ ]* +uh8 [0-9a-f]+ [^ ]* +uh9 [0-9a-f]+ [^ ]* +uh9 -[0-9a-f]+ [^ ]* +(ld1|\.text)(\+0x[0-9a-f]+)? -[0-9a-f]+ [^ ]* +(ld2|\.text)(\+0x[0-9a-f]+)? -[0-9a-f]+ [^ ]* +(ld3|\.text)(\+0x[0-9a-f]+)? -[0-9a-f]+ [^ ]* +(ld4|\.text)(\+0x[0-9a-f]+)? +[0-9a-f]+ [^ ]* +(ld1|\.text|\$CODE\$)(\+0x[0-9a-f]+)? +[0-9a-f]+ [^ ]* +(ld2|\.text|\$CODE\$)(\+0x[0-9a-f]+)? +[0-9a-f]+ [^ ]* +(ld3|\.text|\$CODE\$)(\+0x[0-9a-f]+)? +[0-9a-f]+ [^ ]* +(ld4|\.text|\$CODE\$)(\+0x[0-9a-f]+)? [0-9a-f]+ [^ ]* +ud5 -[0-9a-f]+ [^ ]* +(gd6|\.text)(\+0x[0-9a-f]+)? -[0-9a-f]+ [^ ]* +(gd7|\.text)(\+0x[0-9a-f]+)? -[0-9a-f]+ [^ ]* +(ld8|\.text)(\+0x[0-9a-f]+)? -[0-9a-f]+ [^ ]* +(ld8|\.text)(\+0x[0-9a-f]+)? -[0-9a-f]+ [^ ]* +(ld9|\.text)(\+0x[0-9a-f]+)? -[0-9a-f]+ [^ ]* +(ld9|\.text)(\+0x[0-9a-f]+)? +[0-9a-f]+ [^ ]* +(gd6|\.text|\$CODE\$)(\+0x[0-9a-f]+)? +[0-9a-f]+ [^ ]* +(gd7|\.text|\$CODE\$)(\+0x[0-9a-f]+)? +[0-9a-f]+ [^ ]* +(ld8|\.text|\$CODE\$)(\+0x[0-9a-f]+)? +[0-9a-f]+ [^ ]* +(ld8|\.text|\$CODE\$)(\+0x[0-9a-f]+)? +[0-9a-f]+ [^ ]* +(ld9|\.text|\$CODE\$)(\+0x[0-9a-f]+)? +[0-9a-f]+ [^ ]* +(ld9|\.text|\$CODE\$)(\+0x[0-9a-f]+)? diff --git a/gas/testsuite/gas/hppa/reloc/reloc.exp b/gas/testsuite/gas/hppa/reloc/reloc.exp index 652e2560f6..c1b9fa9aa1 100644 --- a/gas/testsuite/gas/hppa/reloc/reloc.exp +++ b/gas/testsuite/gas/hppa/reloc/reloc.exp @@ -636,9 +636,9 @@ proc do_apply_test {} { while 1 { expect { - -re "^ +\[0-9\]+ 0000 00000000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0004 00000000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0008 00000000\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0000 00000044\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0004 00000058\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0008 0000006C\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } |