From 7f1c66244cb6de1538de71311e3cf98c488b9022 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Tue, 21 Dec 2004 13:09:55 +0000 Subject: [PATCH] * gas/elf/section5.e, gas/elf/section5.l: Replace [:digit:], [:xdigit:] and {N} in regexps with [0-9], [0-9a-fA-F] and N copies, to cater to tcl versions before Tcl 8.2.3. --- gas/testsuite/ChangeLog | 6 ++++ gas/testsuite/gas/elf/section5.e | 10 +++---- gas/testsuite/gas/elf/section5.l | 48 ++++++++++++++++---------------- 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 11c7d9ddd4a..05b127417b6 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-12-21 Hans-Peter Nilsson + + * gas/elf/section5.e, gas/elf/section5.l: Replace [:digit:], + [:xdigit:] and {N} in regexps with [0-9], [0-9a-fA-F] and N + copies, to cater to tcl versions before Tcl 8.2.3. + 2004-12-20 Nick Clifton * gas/elf/section5.[ls]: Use % instead of @ in .section diff --git a/gas/testsuite/gas/elf/section5.e b/gas/testsuite/gas/elf/section5.e index f1c4f7a0250..4474f3614a4 100644 --- a/gas/testsuite/gas/elf/section5.e +++ b/gas/testsuite/gas/elf/section5.e @@ -1,8 +1,8 @@ -.* \.test0[ ]+PROGBITS[ ]+([[:xdigit:]]+[ ]+){4}[ ]+[[:digit:]]+.* -.* \.test1[ ]+PROGBITS[ ]+([[:xdigit:]]+[ ]+){4}[ ]+[[:digit:]]+.* +.* \.test0[ ]+PROGBITS[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[ ]+[0-9]+.* +.* \.test1[ ]+PROGBITS[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[ ]+[0-9]+.* .* \.rela?\.test1[ ]+RELA?[ ]+.* -.* \.test2[ ]+PROGBITS[ ]+([[:xdigit:]]+[ ]+){4}[ ]+[[:digit:]]+.* +.* \.test2[ ]+PROGBITS[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[ ]+[0-9]+.* .* \.rela?\.test2[ ]+RELA?[ ]+.* -.* \.test3[ ]+PROGBITS[ ]+([[:xdigit:]]+[ ]+){4}WA[ ]+[[:digit:]]+.* +.* \.test3[ ]+PROGBITS[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+WA[ ]+[0-9]+.* .* \.rela?\.test3[ ]+RELA?[ ]+.* -.* \.test4[ ]+NOBITS[ ]+([[:xdigit:]]+[ ]+){4}WA[ ]+[[:digit:]]+.* +.* \.test4[ ]+NOBITS[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+[0-9a-fA-F]+[ ]+WA[ ]+[0-9]+.* diff --git a/gas/testsuite/gas/elf/section5.l b/gas/testsuite/gas/elf/section5.l index 82a1b4b2ff4..ed547583d73 100644 --- a/gas/testsuite/gas/elf/section5.l +++ b/gas/testsuite/gas/elf/section5.l @@ -11,27 +11,27 @@ .*GAS.* -[ ]+[[:digit:]]+[ ]+.section[ ]+.test0[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.test1,[ ]*"",[ ]*%progbits[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.test2[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.test3,[ ]*"aw"[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.test4,[ ]*"aw",[ ]*%nobits[ ]* -[ ]+[[:digit:]]+[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.test1,[ ]*"aw",[ ]*%nobits[ ]* -[ ]+[[:digit:]]+[ ]+.* -[ ]+[[:digit:]]+[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.test2,[ ]*"w"[ ]* -[ ]+[[:digit:]]+[ ]+.* -[ ]+[[:digit:]]+[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.test3,[ ]*"aw",[ ]*%progbits[ ]* -[ ]+[[:digit:]]+[ ]+.* -[ ]+[[:digit:]]+[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.test4,[ ]*"aw"[ ]* -[ ]+[[:digit:]]+[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.data,[ ]*"a"[ ]* -[ ]+[[:digit:]]+[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.bss,[ ]*"a"[ ]* -[ ]+[[:digit:]]+[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.data,[ ]*"aw",[ ]*%nobits[ ]* -[ ]+[[:digit:]]+[ ]* -[ ]+[[:digit:]]+[ ]+.section[ ]+.bss,[ ]*"aw",[ ]*%progbits[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.test0[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.test1,[ ]*"",[ ]*%progbits[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.test2[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.test3,[ ]*"aw"[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.test4,[ ]*"aw",[ ]*%nobits[ ]* +[ ]+[0-9]+[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.test1,[ ]*"aw",[ ]*%nobits[ ]* +[ ]+[0-9]+[ ]+.* +[ ]+[0-9]+[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.test2,[ ]*"w"[ ]* +[ ]+[0-9]+[ ]+.* +[ ]+[0-9]+[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.test3,[ ]*"aw",[ ]*%progbits[ ]* +[ ]+[0-9]+[ ]+.* +[ ]+[0-9]+[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.test4,[ ]*"aw"[ ]* +[ ]+[0-9]+[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.data,[ ]*"a"[ ]* +[ ]+[0-9]+[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.bss,[ ]*"a"[ ]* +[ ]+[0-9]+[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.data,[ ]*"aw",[ ]*%nobits[ ]* +[ ]+[0-9]+[ ]* +[ ]+[0-9]+[ ]+.section[ ]+.bss,[ ]*"aw",[ ]*%progbits[ ]* -- 2.30.2