From 9af143723361bf8afcc6c0ba82a35ac3d2423fb9 Mon Sep 17 00:00:00 2001 From: Dave Anglin Date: Sun, 20 Nov 2005 22:03:25 +0000 Subject: [PATCH] Bug gas/1879 * gas/all/weakref1.d: Check for "$CODE$" as well as ".text". * gas/all/weakref1.s: Indent "-ld1 = l". * gas/all/weakref1g.d: Remove --no-sort option. * gas/all/weakref1l.d: Likewise. * gas/all/weakref1u.d: Likewise. Sort expected results. * gas/all/weakref1w.d: Likewise. * gas/all/weakref2.s: Indent directives. * gas/all/weakref3.s: Likewise. --- gas/testsuite/ChangeLog | 12 +++++++++ gas/testsuite/gas/all/weakref1.d | 2 +- gas/testsuite/gas/all/weakref1.s | 2 +- gas/testsuite/gas/all/weakref1g.d | 2 +- gas/testsuite/gas/all/weakref1l.d | 2 +- gas/testsuite/gas/all/weakref1u.d | 6 ++--- gas/testsuite/gas/all/weakref1w.d | 42 +++++++++++++++---------------- gas/testsuite/gas/all/weakref2.s | 10 ++++---- gas/testsuite/gas/all/weakref3.s | 10 ++++---- 9 files changed, 50 insertions(+), 38 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index dafe7047ed..f06098c57e 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2005-11-20 John David Anglin + + Bug gas/1879 + * gas/all/weakref1.d: Check for "$CODE$" as well as ".text". + * gas/all/weakref1.s: Indent "-ld1 = l". + * gas/all/weakref1g.d: Remove --no-sort option. + * gas/all/weakref1l.d: Likewise. + * gas/all/weakref1u.d: Likewise. Sort expected results. + * gas/all/weakref1w.d: Likewise. + * gas/all/weakref2.s: Indent directives. + * gas/all/weakref3.s: Likewise. + 2005-11-17 Jan Beulich * gas/all/cond.s: Also check ifdef works on equates and diff --git a/gas/testsuite/gas/all/weakref1.d b/gas/testsuite/gas/all/weakref1.d index ab8f484bce..dadd280033 100644 --- a/gas/testsuite/gas/all/weakref1.d +++ b/gas/testsuite/gas/all/weakref1.d @@ -6,7 +6,7 @@ #not-target: alpha*-*-osf* *-*-ecoff pdp11-*-aout #... -RELOCATION RECORDS FOR \[\.text\]: +RELOCATION RECORDS FOR \[(\.text|\$CODE\$)\]: OFFSET +TYPE +VALUE * # the rest of this file is generated with the following script: # # script begin diff --git a/gas/testsuite/gas/all/weakref1.s b/gas/testsuite/gas/all/weakref1.s index 0c48c279cf..ce550d842a 100644 --- a/gas/testsuite/gas/all/weakref1.s +++ b/gas/testsuite/gas/all/weakref1.s @@ -189,7 +189,7 @@ l: /* d# target symbol definitions */ .weakref Wld1, ld1 .long Wld1 -ld1 = l + ld1 = l .weakref Wld2, ld2 .long Wld2 diff --git a/gas/testsuite/gas/all/weakref1g.d b/gas/testsuite/gas/all/weakref1g.d index 999a3fc390..039c599786 100644 --- a/gas/testsuite/gas/all/weakref1g.d +++ b/gas/testsuite/gas/all/weakref1g.d @@ -1,4 +1,4 @@ -#nm: --defined-only --extern-only --no-sort +#nm: --defined-only --extern-only #name: weakref tests, global syms #source: weakref1.s # see weakref1.d for comments on the not-targets diff --git a/gas/testsuite/gas/all/weakref1l.d b/gas/testsuite/gas/all/weakref1l.d index 7d9257876a..05ba4583b4 100644 --- a/gas/testsuite/gas/all/weakref1l.d +++ b/gas/testsuite/gas/all/weakref1l.d @@ -1,4 +1,4 @@ -#nm: --defined-only --no-sort +#nm: --defined-only #name: weakref tests, local syms #source: weakref1.s # aix drops local symbols diff --git a/gas/testsuite/gas/all/weakref1u.d b/gas/testsuite/gas/all/weakref1u.d index e46c196f8b..f140addc33 100644 --- a/gas/testsuite/gas/all/weakref1u.d +++ b/gas/testsuite/gas/all/weakref1u.d @@ -1,4 +1,4 @@ -#nm: --undefined-only --no-sort +#nm: --undefined-only #name: weakref tests, strong undefined syms #source: weakref1.s # aout turns undefined into *ABS* symbols. @@ -39,11 +39,11 @@ #... .* U uc9 #... -.* U um5 +.* U ud5 #... .* U uh8 #... .* U uh9 #... -.* U ud5 +.* U um5 #pass diff --git a/gas/testsuite/gas/all/weakref1w.d b/gas/testsuite/gas/all/weakref1w.d index d5ddb882bc..459877616a 100644 --- a/gas/testsuite/gas/all/weakref1w.d +++ b/gas/testsuite/gas/all/weakref1w.d @@ -1,4 +1,4 @@ -#nm: --undefined-only --no-sort +#nm: --undefined-only #name: weakref tests, weak undefined syms #source: weakref1.s # see weakref1.d for comments on the not-targets @@ -16,8 +16,28 @@ #... .* w wc1 #... +.* w wh2 +#... +.* w wh3 +#... +.* w wh4 +#... +.* w wh5 +#... +.* w wh6 +#... +.* w wh7 +#... +.* w wm6 +#... +.* w wm7 +#... +.* w wm8 +#... .* w ww1 #... +.* w ww10 +#... .* w ww2 #... .* w ww3 @@ -33,24 +53,4 @@ .* w ww8 #... .* w ww9 -#... -.* w ww10 -#... -.* w wm6 -#... -.* w wm7 -#... -.* w wm8 -#... -.* w wh2 -#... -.* w wh3 -#... -.* w wh4 -#... -.* w wh5 -#... -.* w wh6 -#... -.* w wh7 #pass diff --git a/gas/testsuite/gas/all/weakref2.s b/gas/testsuite/gas/all/weakref2.s index 0f9cdc701a..049f1ec8e1 100644 --- a/gas/testsuite/gas/all/weakref2.s +++ b/gas/testsuite/gas/all/weakref2.s @@ -1,5 +1,5 @@ -.weakref a,b -.weakref b,c -.weakref c,d -.weakref d,e -.weakref e,a + .weakref a,b + .weakref b,c + .weakref c,d + .weakref d,e + .weakref e,a diff --git a/gas/testsuite/gas/all/weakref3.s b/gas/testsuite/gas/all/weakref3.s index 9e5219ad18..48f6987727 100644 --- a/gas/testsuite/gas/all/weakref3.s +++ b/gas/testsuite/gas/all/weakref3.s @@ -1,5 +1,5 @@ -.weakref e,a -.weakref d,e -.weakref c,d -.weakref b,c -.weakref a,b + .weakref e,a + .weakref d,e + .weakref c,d + .weakref b,c + .weakref a,b