* ld-elfvers/vers.exp (objdump_versionstuff): Allow versions in
any order. * ld-elfvers/vers1.ver: Update. * ld-elfvers/vers2.ver: Update. * ld-elfvers/vers4a.ver: Update. * ld-elfvers/vers7a.ver: Update. * ld-elfvers/vers8.ver: Update. * ld-elfvers/vers9.ver: Update. * ld-elfvers/vers15.ver: Update. * ld-elfvers/vers16a.ver: Update. * ld-elfvers/vers17.ver: Update. * ld-elfvers/vers18.ver: Update. * ld-elfvers/vers20.ver: Update. * ld-elfvers/vers20a.ver: Update. * ld-elfvers/vers21.ver: Update. * ld-elfvers/vers22a.ver: Update. * ld-elfvers/vers22b.ver: Update. * ld-elfvers/vers23a.ver: Update. * ld-elfvers/vers23b.ver: Update. * ld-elfvers/vers23c.ver: Update. * ld-elfvers/vers25a.ver: Update. * ld-elfvers/vers26a.ver: Update. * ld-elfvers/vers27a.ver: Update. * ld-elfvers/vers27d.ver: Update. * ld-elfvers/vers28b.ver: Update. * ld-elfvers/vers29.ver: Update. * ld-elfvers/vers30.ver: Update. * ld-elfvers/vers31.ver: Update.
This commit is contained in:
parent
0bef4ce538
commit
65864bd2a6
@ -1,3 +1,34 @@
|
||||
2006-06-06 Alan Modra <amodra@bigpond.net.au>
|
||||
|
||||
* ld-elfvers/vers.exp (objdump_versionstuff): Allow versions in
|
||||
any order.
|
||||
* ld-elfvers/vers1.ver: Update.
|
||||
* ld-elfvers/vers2.ver: Update.
|
||||
* ld-elfvers/vers4a.ver: Update.
|
||||
* ld-elfvers/vers7a.ver: Update.
|
||||
* ld-elfvers/vers8.ver: Update.
|
||||
* ld-elfvers/vers9.ver: Update.
|
||||
* ld-elfvers/vers15.ver: Update.
|
||||
* ld-elfvers/vers16a.ver: Update.
|
||||
* ld-elfvers/vers17.ver: Update.
|
||||
* ld-elfvers/vers18.ver: Update.
|
||||
* ld-elfvers/vers20.ver: Update.
|
||||
* ld-elfvers/vers20a.ver: Update.
|
||||
* ld-elfvers/vers21.ver: Update.
|
||||
* ld-elfvers/vers22a.ver: Update.
|
||||
* ld-elfvers/vers22b.ver: Update.
|
||||
* ld-elfvers/vers23a.ver: Update.
|
||||
* ld-elfvers/vers23b.ver: Update.
|
||||
* ld-elfvers/vers23c.ver: Update.
|
||||
* ld-elfvers/vers25a.ver: Update.
|
||||
* ld-elfvers/vers26a.ver: Update.
|
||||
* ld-elfvers/vers27a.ver: Update.
|
||||
* ld-elfvers/vers27d.ver: Update.
|
||||
* ld-elfvers/vers28b.ver: Update.
|
||||
* ld-elfvers/vers29.ver: Update.
|
||||
* ld-elfvers/vers30.ver: Update.
|
||||
* ld-elfvers/vers31.ver: Update.
|
||||
|
||||
2006-06-05 Alan Modra <amodra@bigpond.net.au>
|
||||
|
||||
* ld-elf/sec64k.exp: Add "main" symbol. Use dc.a for addresses.
|
||||
|
@ -460,44 +460,33 @@ proc objdump_versionstuff { objdump object expectfile } {
|
||||
|
||||
# It's OK if there are extra lines in the actual output; they
|
||||
# may come from version information in libc. We require that
|
||||
# every line in EXPECTFILE appear in the output in order.
|
||||
# every line in EXPECTFILE appear in the output in any order.
|
||||
|
||||
set f1 [open $tmpdir/objdump.out r]
|
||||
set f2 [open $expectfile r]
|
||||
while { [gets $f2 l2] != -1 } {
|
||||
if { ![regexp "^#.*$" $l2] } then {
|
||||
break
|
||||
}
|
||||
}
|
||||
while { [gets $f1 l1] != -1 } {
|
||||
if { [string match $l2 $l1] } then {
|
||||
if { [gets $f2 l2] == -1 } then {
|
||||
set f1 [open $tmpdir/objdump.out r]
|
||||
while { [gets $f1 l1] != -1 } {
|
||||
if { [string match $l2 $l1] } then {
|
||||
break
|
||||
}
|
||||
}
|
||||
close $f1
|
||||
|
||||
if { ![string match $l2 $l1] } then {
|
||||
verbose -log "Did not find \"$l2\""
|
||||
set f1 [open $tmpdir/objdump.out r]
|
||||
while { [gets $f1 l1] != -1 } {
|
||||
verbose -log $l1
|
||||
}
|
||||
close $f1
|
||||
close $f2
|
||||
return 1
|
||||
return 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# We reached the end of the output without seeing the line we
|
||||
# expected. This is a test failure.
|
||||
|
||||
close $f1
|
||||
close $f2
|
||||
|
||||
# Support empty expected file.
|
||||
if [string match "" $l2] then {
|
||||
return 1
|
||||
}
|
||||
|
||||
verbose -log "Did not find \"$l2\""
|
||||
set f1 [open $tmpdir/objdump.out r]
|
||||
while { [gets $f1 l1] != -1 } {
|
||||
verbose -log $l1
|
||||
}
|
||||
|
||||
verbose -log "$exec_output"
|
||||
return 0
|
||||
return 1
|
||||
} else {
|
||||
verbose -log "$exec_output"
|
||||
return 0
|
||||
|
@ -1,8 +1,8 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0c96425f vers1.so
|
||||
2 0x00 0x0a7927b1 VERS_1.1
|
||||
3 0x00 0x0a7927b2 VERS_1.2
|
||||
[1-4] 0x01 0x0c96425f vers1.so
|
||||
[1-4] 0x00 0x0a7927b1 VERS_1.1
|
||||
[1-4] 0x00 0x0a7927b2 VERS_1.2
|
||||
VERS_1.1
|
||||
4 0x00 0x0a7922b0 VERS_2.0
|
||||
[1-4] 0x00 0x0a7922b0 VERS_2.0
|
||||
VERS_1.2
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
Version definitions:
|
||||
1 0x01 0x07cc9645 vers15
|
||||
2 0x00 0x0a7927b2 VERS_1.2
|
||||
3 0x00 0x0a7927b1 VERS_1.1
|
||||
[1-3] 0x01 0x07cc9645 vers15
|
||||
[1-3] 0x00 0x0a7927b1 VERS_1.1
|
||||
[1-3] 0x00 0x0a7927b2 VERS_1.2
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
Version definitions:
|
||||
1 0x01 0x064c090f vers16a.so
|
||||
2 0x00 0x0a7927b1 VERS_1.1
|
||||
[1-2] 0x01 0x064c090f vers16a.so
|
||||
[1-2] 0x00 0x0a7927b1 VERS_1.1
|
||||
|
@ -1,3 +1,3 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0964f95f vers17.so
|
||||
2 0x00 0x0a7922b0 VERS_2.0
|
||||
[1-2] 0x01 0x0964f95f vers17.so
|
||||
[1-2] 0x00 0x0a7922b0 VERS_2.0
|
||||
|
@ -1,7 +1,7 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0964e95f vers18.so
|
||||
2 0x00 0x0a7927b1 VERS_1.1
|
||||
3 0x00 0x0a7927b2 VERS_1.2
|
||||
[1-4] 0x01 0x0964e95f vers18.so
|
||||
[1-4] 0x00 0x0a7927b1 VERS_1.1
|
||||
[1-4] 0x00 0x0a7927b2 VERS_1.2
|
||||
VERS_1.1
|
||||
4 0x00 0x0a7922b0 VERS_2.0
|
||||
[1-4] 0x00 0x0a7922b0 VERS_2.0
|
||||
VERS_1.2
|
||||
|
@ -1,6 +1,6 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0c96525f vers2.so
|
||||
2 0x00 0x08785b51 VERS_XXX_1.1
|
||||
[1-2] 0x01 0x0c96525f vers2.so
|
||||
[1-2] 0x00 0x08785b51 VERS_XXX_1.1
|
||||
|
||||
Version References:
|
||||
required from tmpdir/vers1.so:
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0965695f vers20.so
|
||||
2 0x00 0x0a7927b1 VERS_1.1
|
||||
[1-2] 0x01 0x0965695f vers20.so
|
||||
[1-2] 0x00 0x0a7927b1 VERS_1.1
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0652090f vers20a.so
|
||||
2 0x00 0x0a7927b1 VERS_1.1
|
||||
[1-2] 0x01 0x0652090f vers20a.so
|
||||
[1-2] 0x00 0x0a7927b1 VERS_1.1
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0965595f vers21.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x0965595f vers21.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0660090f vers22a.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x0660090f vers22a.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x065f990f vers22b.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x065f990f vers22b.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x065f090f vers23a.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x065f090f vers23a.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x065e990f vers23b.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x065e990f vers23b.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x065ea90f vers23c.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x065ea90f vers23c.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x065d090f vers25a.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x065d090f vers25a.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x065c090f vers26a.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x065c090f vers26a.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x065b090f vers27a.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x065b090f vers27a.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x05ac0cff vers27d1.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x05ac0cff vers27d1.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0659990f vers28b.so
|
||||
2 0x00 0x05aa7610 VERS.0
|
||||
[1-2] 0x01 0x0659990f vers28b.so
|
||||
[1-2] 0x00 0x05aa7610 VERS.0
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0965d95f vers29.so
|
||||
2 0x00 0x0965d95f vers29.so
|
||||
[1-2] 0x01 0x0965d95f vers29.so
|
||||
[1-2] 0x00 0x0965d95f vers29.so
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0966695f vers30.so
|
||||
2 0x00 0x079239b0 VERS_30.0
|
||||
[1-2] 0x01 0x0966695f vers30.so
|
||||
[1-2] 0x00 0x079239b0 VERS_30.0
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0966595f vers31.so
|
||||
2 0x00 0x07923ab0 VERS_31.0
|
||||
[1-2] 0x01 0x0966595f vers31.so
|
||||
[1-2] 0x00 0x07923ab0 VERS_31.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x07cc96a1 vers4a
|
||||
2 0x00 0x0a7922b0 VERS_2.0
|
||||
[1-2] 0x01 0x07cc96a1 vers4a
|
||||
[1-2] 0x00 0x0a7922b0 VERS_2.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Version definitions:
|
||||
1 0x01 0x096d595f vers7a.so
|
||||
2 0x00 0x05aa7921 VERS_1
|
||||
[1-2] 0x01 0x096d595f vers7a.so
|
||||
[1-2] 0x00 0x05aa7921 VERS_1
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
Version definitions:
|
||||
1 0x01 0x0c96b25f vers8.so
|
||||
2 0x00 0x0a7927b1 VERS_1.1
|
||||
3 0x00 0x0a7927b2 VERS_1.2
|
||||
[1-4] 0x01 0x0c96b25f vers8.so
|
||||
[1-4] 0x00 0x0a7927b1 VERS_1.1
|
||||
[1-4] 0x00 0x0a7927b2 VERS_1.2
|
||||
VERS_1.1
|
||||
4 0x00 0x0a7922b0 VERS_2.0
|
||||
[1-4] 0x00 0x0a7922b0 VERS_2.0
|
||||
VERS_1.2
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
Version definitions:
|
||||
1 0x01 0x007cc969 vers9
|
||||
2 0x00 0x0a7927b1 VERS_1.1
|
||||
3 0x00 0x0a7927b2 VERS_1.2
|
||||
[1-3] 0x01 0x007cc969 vers9
|
||||
[1-3] 0x00 0x0a7927b1 VERS_1.1
|
||||
[1-3] 0x00 0x0a7927b2 VERS_1.2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user