diff options
| -rw-r--r-- | ld/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/testsuite/ld-ctf/array.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-ctf/data-func-conflicted.d | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-ctf/diag-parlabel.d | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-ctf/function.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-ctf/slice.d | 2 |
6 files changed, 18 insertions, 8 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 19b56f0..c10bc39 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +2021-03-25 Nick Alcock <nick.alcock@oracle.com> + + * testsuite/ld-ctf/array.d: Only check that the data object + section is nonempty: do not check its exact size. + * testsuite/ld-ctf/diag-parlabel.d: Likewise. + * testsuite/ld-ctf/slice.d: Likewise. + * testsuite/ld-ctf/data-func-conflicted.d: Likewise, and for the + func info section too. + * testsuite/ld-ctf/function.d: Likewise, for the func info section. + 2021-03-22 Martin Liska <mliska@suse.cz> * emultempl/aix.em: Replace usage of CONST_STRNEQ with startswith. diff --git a/ld/testsuite/ld-ctf/array.d b/ld/testsuite/ld-ctf/array.d index 1637562..ab262d9 100644 --- a/ld/testsuite/ld-ctf/array.d +++ b/ld/testsuite/ld-ctf/array.d @@ -13,7 +13,7 @@ Contents of CTF section .ctf: Magic number: 0xdff2 Version: 4 \(CTF_VERSION_3\) #... - Data object section: .* \(0x8 bytes\) + Data object section: .* \(0x[1-9a-f][0-9a-f]* bytes\) Type section: .* \(0x5c bytes\) String section: .* diff --git a/ld/testsuite/ld-ctf/data-func-conflicted.d b/ld/testsuite/ld-ctf/data-func-conflicted.d index 1e7c19a..87dd4b6 100644 --- a/ld/testsuite/ld-ctf/data-func-conflicted.d +++ b/ld/testsuite/ld-ctf/data-func-conflicted.d @@ -13,8 +13,8 @@ Contents of CTF section \.ctf: Magic number: 0xdff2 Version: 4 \(CTF_VERSION_3\) #... - Data object section: .* \(0xc bytes\) - Function info section: .* \(0x44 bytes\) + Data object section: .* \(0x[1-9a-f][0-9a-f]* bytes\) + Function info section: .* \(0x[1-9a-f][0-9a-f]* bytes\) Object index section: .* \(0xc bytes\) Type section: .* \(0xf4 bytes\) String section: .* @@ -39,7 +39,7 @@ CTF archive member: .*/data-func-1\.c: #... Parent name: \.ctf Compilation unit name: .*/data-func-1\.c - Data object section: .* \(0xfa4 bytes\) + Data object section: .* \(0x[1-9a-f][0-9a-f]* bytes\) Type section: .* \(0xc bytes\) String section: .* diff --git a/ld/testsuite/ld-ctf/diag-parlabel.d b/ld/testsuite/ld-ctf/diag-parlabel.d index bba161c..9d2c086 100644 --- a/ld/testsuite/ld-ctf/diag-parlabel.d +++ b/ld/testsuite/ld-ctf/diag-parlabel.d @@ -13,8 +13,8 @@ Contents of CTF section .ctf: Version: 4 \(CTF_VERSION_3\) #... Compilation unit name: .*A.c - Data object section: 0x0 -- 0x3 \(0x4 bytes\) - Type section: 0x4 -- 0x33 \(0x30 bytes\) + Data object section: .* \(0x[1-9a-f][0-9a-f]* bytes\) + Type section: .* \(0x30 bytes\) String section: .* Labels: diff --git a/ld/testsuite/ld-ctf/function.d b/ld/testsuite/ld-ctf/function.d index 1584bdb..e6cb209 100644 --- a/ld/testsuite/ld-ctf/function.d +++ b/ld/testsuite/ld-ctf/function.d @@ -13,7 +13,7 @@ Contents of CTF section .ctf: Version: 4 \(CTF_VERSION_3\) #... Compilation unit name: .*function.c - Function info section: .* \(0x4 bytes\) + Function info section: .* \(0x[1-9a-f][0-9a-f]* bytes\) Type section: .* \(0x90 bytes\) String section: .* #... diff --git a/ld/testsuite/ld-ctf/slice.d b/ld/testsuite/ld-ctf/slice.d index 72a7074..efe32a8 100644 --- a/ld/testsuite/ld-ctf/slice.d +++ b/ld/testsuite/ld-ctf/slice.d @@ -14,7 +14,7 @@ Contents of CTF section .ctf: #... Compilation unit name: .*slice.c #... - Data object section: .* \(0x4 bytes\) + Data object section: .* \(0x[1-9a-f][0-9a-f]* bytes\) Type section: .* \(0xd0 bytes\) String section: .* #... |