From 88fe28bd767847d61c34ff4595d672609d76174a Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Wed, 7 Jan 2009 03:27:11 +0000 Subject: [PATCH] * ld-cris/tls-e-20.d, ld-cris/tls-e-20a.d, ld-cris/tls-e-21.d, ld-cris/tls-e-23.d, ld-cris/tls-e-66.d, ld-cris/tls-gd-3.d, ld-cris/tls-gd-3h.d, ld-cris/tls-global-74.d, ld-cris/tls-ie-8e1.d, ld-cris/tls-ldgde-14.d, ld-cris/tls-ldgde-15.d, ld-cris/tls-le-12.d, ld-cris/tls-le-13.d, ld-cris/tls-le-13s.d, ld-cris/tls-legd-16.d, ld-cris/tls-legd-17.d, ld-cris/tls-legdx-16.d, ld-cris/tls-legdx-17.d, ld-cris/tls-leie-18.d, ld-cris/tls-leie-19.d, ld-cris/tls-local-57.d, ld-cris/tls-local-58.d, ld-cris/tls-local-59.d: Adjust for relocation value now offset by negative program TLS block size. * ld-cris/tls-le-12s.d: Ditto. Move 128-byte tls-data to last. Adjust accordingly. * ld-cris/tls-le-12s.s: Use movs, not movu, for sign-extended always-negative relocation. * ld-cris/tls-tprelm.s: Move filler data to after symbol for tested relocation. * ld-cris/tls-ok-36.d: Adjust accordingly. --- ld/testsuite/ChangeLog | 21 +++++++++++++++++++++ ld/testsuite/ld-cris/tls-e-20.d | 2 +- ld/testsuite/ld-cris/tls-e-20a.d | 2 +- ld/testsuite/ld-cris/tls-e-21.d | 2 +- ld/testsuite/ld-cris/tls-e-23.d | 2 +- ld/testsuite/ld-cris/tls-e-66.d | 2 +- ld/testsuite/ld-cris/tls-gd-3.d | 2 +- ld/testsuite/ld-cris/tls-gd-3h.d | 2 +- ld/testsuite/ld-cris/tls-global-74.d | 4 ++-- ld/testsuite/ld-cris/tls-ie-8e1.d | 2 +- ld/testsuite/ld-cris/tls-ldgde-14.d | 4 ++-- ld/testsuite/ld-cris/tls-ldgde-15.d | 4 ++-- ld/testsuite/ld-cris/tls-le-12.d | 2 +- ld/testsuite/ld-cris/tls-le-12s.d | 6 +++--- ld/testsuite/ld-cris/tls-le-12s.s | 2 +- ld/testsuite/ld-cris/tls-le-13.d | 4 ++-- ld/testsuite/ld-cris/tls-le-13s.d | 4 ++-- ld/testsuite/ld-cris/tls-legd-16.d | 6 +++--- ld/testsuite/ld-cris/tls-legd-17.d | 6 +++--- ld/testsuite/ld-cris/tls-legdx-16.d | 2 +- ld/testsuite/ld-cris/tls-legdx-17.d | 2 +- ld/testsuite/ld-cris/tls-leie-18.d | 8 ++++---- ld/testsuite/ld-cris/tls-leie-19.d | 8 ++++---- ld/testsuite/ld-cris/tls-local-57.d | 2 +- ld/testsuite/ld-cris/tls-local-58.d | 2 +- ld/testsuite/ld-cris/tls-local-59.d | 4 ++-- ld/testsuite/ld-cris/tls-ok-36.d | 2 +- ld/testsuite/ld-cris/tls-tprelm.s | 12 ++++++------ 28 files changed, 71 insertions(+), 50 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 74e81540005..f0728e50d75 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,24 @@ +2009-01-07 Hans-Peter Nilsson + + * ld-cris/tls-e-20.d, ld-cris/tls-e-20a.d, ld-cris/tls-e-21.d, + ld-cris/tls-e-23.d, ld-cris/tls-e-66.d, ld-cris/tls-gd-3.d, + ld-cris/tls-gd-3h.d, ld-cris/tls-global-74.d, + ld-cris/tls-ie-8e1.d, ld-cris/tls-ldgde-14.d, + ld-cris/tls-ldgde-15.d, ld-cris/tls-le-12.d, ld-cris/tls-le-13.d, + ld-cris/tls-le-13s.d, ld-cris/tls-legd-16.d, + ld-cris/tls-legd-17.d, ld-cris/tls-legdx-16.d, + ld-cris/tls-legdx-17.d, ld-cris/tls-leie-18.d, + ld-cris/tls-leie-19.d, ld-cris/tls-local-57.d, + ld-cris/tls-local-58.d, ld-cris/tls-local-59.d: Adjust for + relocation value now offset by negative program TLS block size. + * ld-cris/tls-le-12s.d: Ditto. Move 128-byte tls-data to last. + Adjust accordingly. + * ld-cris/tls-le-12s.s: Use movs, not movu, for sign-extended + always-negative relocation. + * ld-cris/tls-tprelm.s: Move filler data to after symbol for + tested relocation. + * ld-cris/tls-ok-36.d: Adjust accordingly. + 2009-01-03 Hans-Peter Nilsson * ld-cris/tls-js1.d: New test. diff --git a/ld/testsuite/ld-cris/tls-e-20.d b/ld/testsuite/ld-cris/tls-e-20.d index d4d4116b08f..81ec6d09562 100644 --- a/ld/testsuite/ld-cris/tls-e-20.d +++ b/ld/testsuite/ld-cris/tls-e-20.d @@ -53,7 +53,7 @@ Contents of section \.tdata: 820b0 28000000 29000000 2a000000 .* Contents of section \.got: 820bc 00000000 00000000 00000000 01000000 .* - 820cc 00000000 00000000 01000000 00000000 .* + 820cc 00000000 f4ffffff 01000000 f4ffffff .* Disassembly of section \.text: diff --git a/ld/testsuite/ld-cris/tls-e-20a.d b/ld/testsuite/ld-cris/tls-e-20a.d index 47f0a5089e2..ba195fcc973 100644 --- a/ld/testsuite/ld-cris/tls-e-20a.d +++ b/ld/testsuite/ld-cris/tls-e-20a.d @@ -75,7 +75,7 @@ Contents of section \.tdata: 8215c 28000000 29000000 2a000000 .* Contents of section \.got: 82168 00000000 00000000 00000000 01000000 .* - 82178 00000000 80000000 01000000 80000000 .* + 82178 00000000 f4ffffff 01000000 f4ffffff .* 82188 b4210800 ac210800 bc210800 b8210800 .* 82198 a4210800 b0210800 a8210800 .* Contents of section \.data: diff --git a/ld/testsuite/ld-cris/tls-e-21.d b/ld/testsuite/ld-cris/tls-e-21.d index fa56b9faad8..7c383c025dc 100644 --- a/ld/testsuite/ld-cris/tls-e-21.d +++ b/ld/testsuite/ld-cris/tls-e-21.d @@ -27,7 +27,7 @@ Contents of section \.tdata: #... Contents of section \.got: 82124 00000000 00000000 00000000 01000000 .* - 82134 80000000 .* + 82134 fcffffff .* Disassembly of section \.text: diff --git a/ld/testsuite/ld-cris/tls-e-23.d b/ld/testsuite/ld-cris/tls-e-23.d index 3ac46399edc..499899edf76 100644 --- a/ld/testsuite/ld-cris/tls-e-23.d +++ b/ld/testsuite/ld-cris/tls-e-23.d @@ -26,7 +26,7 @@ Contents of section \.text: Contents of section \.tdata: #... Contents of section \.got: - 82124 00000000 00000000 00000000 80000000 .* + 82124 00000000 00000000 00000000 fcffffff .* Disassembly of section \.text: diff --git a/ld/testsuite/ld-cris/tls-e-66.d b/ld/testsuite/ld-cris/tls-e-66.d index a073b940372..ba1755d3fa6 100644 --- a/ld/testsuite/ld-cris/tls-e-66.d +++ b/ld/testsuite/ld-cris/tls-e-66.d @@ -33,5 +33,5 @@ Disassembly of section \.text: 80094: 41b2 moveq 1,\$r11 #... 00080098 : - 80098: 5fac 0000 movu\.w 0x0,\$r10 + 80098: 7fac fcff movs\.w -4,\$r10 #... diff --git a/ld/testsuite/ld-cris/tls-gd-3.d b/ld/testsuite/ld-cris/tls-gd-3.d index b2de85103bc..9019626b37f 100644 --- a/ld/testsuite/ld-cris/tls-gd-3.d +++ b/ld/testsuite/ld-cris/tls-gd-3.d @@ -27,7 +27,7 @@ Contents of section \.tdata: #... Contents of section \.got: 82124 00000000 00000000 00000000 01000000 .* - 82134 80000000 .* + 82134 fcffffff .* Disassembly of section \.text: diff --git a/ld/testsuite/ld-cris/tls-gd-3h.d b/ld/testsuite/ld-cris/tls-gd-3h.d index 78f109da8fa..c2b33f513e6 100644 --- a/ld/testsuite/ld-cris/tls-gd-3h.d +++ b/ld/testsuite/ld-cris/tls-gd-3h.d @@ -27,7 +27,7 @@ Contents of section \.tdata: #... Contents of section \.got: 82124 00000000 00000000 00000000 01000000 .* - 82134 80000000 .* + 82134 fcffffff .* Disassembly of section \.text: diff --git a/ld/testsuite/ld-cris/tls-global-74.d b/ld/testsuite/ld-cris/tls-global-74.d index 964246ef8a7..53849b4faa4 100644 --- a/ld/testsuite/ld-cris/tls-global-74.d +++ b/ld/testsuite/ld-cris/tls-global-74.d @@ -24,5 +24,5 @@ Contents of section .text: 800a4 0+ 5fae1000 5fae0c00 .* #... Contents of section \.got: - 820b4 0+ 0+ 0+ 0+ .* - 820c4 010+ 0+ .* + 820b4 0+ 0+ 0+ fcffffff .* + 820c4 010+ fcffffff .* diff --git a/ld/testsuite/ld-cris/tls-ie-8e1.d b/ld/testsuite/ld-cris/tls-ie-8e1.d index e2bcfd2b76f..0093935a79e 100644 --- a/ld/testsuite/ld-cris/tls-ie-8e1.d +++ b/ld/testsuite/ld-cris/tls-ie-8e1.d @@ -30,7 +30,7 @@ Contents of section .text: 80094 41b20000 6fae3021 08000000 .* #... Contents of section .got: - 82124 00000000 00000000 00000000 80000000 .* + 82124 00000000 00000000 00000000 fcffffff .* Disassembly of section .text: diff --git a/ld/testsuite/ld-cris/tls-ldgde-14.d b/ld/testsuite/ld-cris/tls-ldgde-14.d index 87f73be7bb2..b37da6a064d 100644 --- a/ld/testsuite/ld-cris/tls-ldgde-14.d +++ b/ld/testsuite/ld-cris/tls-ldgde-14.d @@ -42,8 +42,8 @@ Contents of section \.tdata: #... Contents of section \.got: 82138 00000000 00000000 00000000 01000000 .* - 82148 00000000 01000000 80000000 01000000 .* - 82158 84000000 .* + 82148 00000000 01000000 f0ffffff 01000000 .* + 82158 f4ffffff .* Disassembly of section \.text: diff --git a/ld/testsuite/ld-cris/tls-ldgde-15.d b/ld/testsuite/ld-cris/tls-ldgde-15.d index ae563654d20..9b076f717f8 100644 --- a/ld/testsuite/ld-cris/tls-ldgde-15.d +++ b/ld/testsuite/ld-cris/tls-ldgde-15.d @@ -42,8 +42,8 @@ Contents of section \.tdata: #... Contents of section \.got: 82144 00000000 00000000 00000000 01000000 .* - 82154 00000000 01000000 80000000 01000000 .* - 82164 84000000 .* + 82154 00000000 01000000 f0ffffff 01000000 .* + 82164 f4ffffff .* Disassembly of section \.text: diff --git a/ld/testsuite/ld-cris/tls-le-12.d b/ld/testsuite/ld-cris/tls-le-12.d index cc4025a27b1..d24b21b6804 100644 --- a/ld/testsuite/ld-cris/tls-le-12.d +++ b/ld/testsuite/ld-cris/tls-le-12.d @@ -34,5 +34,5 @@ Disassembly of section \.text: 80094: 41b2 moveq 1,\$r11 #... 00080098 : - 80098: 6fae 8000 0000 move\.d 80 ,\$r10 + 80098: 6fae fcff ffff move\.d 0xfffffffc,\$r10 #... diff --git a/ld/testsuite/ld-cris/tls-le-12s.d b/ld/testsuite/ld-cris/tls-le-12s.d index 8b9fb8ff60c..96570e9840a 100644 --- a/ld/testsuite/ld-cris/tls-le-12s.d +++ b/ld/testsuite/ld-cris/tls-le-12s.d @@ -1,7 +1,7 @@ #source: start1.s -#source: tls128.s #source: tls-le-12s.s #source: tls-z.s +#source: tls128.s #as: --no-underscore --em=criself -I$srcdir/$subdir #ld: -m crislinux #objdump: -d -s -t -r -p -h @@ -21,7 +21,7 @@ private flags = 0: CONTENTS.* SYMBOL TABLE: #... -0+80 g \.tdata 0+4 z +0+ g \.tdata 0+4 z #... Contents of section \.text: #... @@ -34,5 +34,5 @@ Disassembly of section \.text: 80094: 41b2 moveq 1,\$r11 #... 00080098 : - 80098: 5fac 8000 movu\.w 0x80,\$r10 + 80098: 7fac 7cff movs\.w -132,\$r10 #... diff --git a/ld/testsuite/ld-cris/tls-le-12s.s b/ld/testsuite/ld-cris/tls-le-12s.s index 8edcbf66894..12e00e169b9 100644 --- a/ld/testsuite/ld-cris/tls-le-12s.s +++ b/ld/testsuite/ld-cris/tls-le-12s.s @@ -3,6 +3,6 @@ .type tlsfn12,@function .p2align 1 tlsfn12: - movu.w z:TPOFF16,$r10 + movs.w z:TPOFF16,$r10 .Lfe12: .size tlsfn12,.Lfe12-tlsfn12 diff --git a/ld/testsuite/ld-cris/tls-le-13.d b/ld/testsuite/ld-cris/tls-le-13.d index 0589eb349bc..3d969ac8e69 100644 --- a/ld/testsuite/ld-cris/tls-le-13.d +++ b/ld/testsuite/ld-cris/tls-le-13.d @@ -36,6 +36,6 @@ Disassembly of section \.text: 80094: 41b2 moveq 1,\$r11 #... 00080098 : - 80098: 6fae 8000 0000 move\.d 80 ,\$r10 - 8009e: 6fae 8400 0000 move\.d 84 ,\$r10 + 80098: 6fae f8ff ffff move\.d 0xfffffff8,\$r10 + 8009e: 6fae fcff ffff move\.d 0xfffffffc,\$r10 #... diff --git a/ld/testsuite/ld-cris/tls-le-13s.d b/ld/testsuite/ld-cris/tls-le-13s.d index 601ad225f24..146c9132bb3 100644 --- a/ld/testsuite/ld-cris/tls-le-13s.d +++ b/ld/testsuite/ld-cris/tls-le-13s.d @@ -36,5 +36,5 @@ Disassembly of section \.text: 80094: 41b2 moveq 1,\$r11 #... 00080098 : - 80098: 5fae 8000 move\.w 0x80,\$r10 - 8009c: 5fae 8400 move\.w 0x84,\$r10 + 80098: 5fae f8ff move\.w 0xfff8,\$r10 + 8009c: 5fae fcff move\.w 0xfffc,\$r10 diff --git a/ld/testsuite/ld-cris/tls-legd-16.d b/ld/testsuite/ld-cris/tls-legd-16.d index 652504205b2..9f464ad4674 100644 --- a/ld/testsuite/ld-cris/tls-legd-16.d +++ b/ld/testsuite/ld-cris/tls-legd-16.d @@ -39,7 +39,7 @@ Contents of section \.text: #... Contents of section \.got: 82144 0+ 0+ 0+ 010+ .* - 82154 80+ 010+ 840+ .* + 82154 f0ffffff 010+ f4ffffff .* Disassembly of section \.text: @@ -47,8 +47,8 @@ Disassembly of section \.text: 80094: 41b2 moveq 1,\$r11 #... 00080098 : - 80098: 6fae 8800 0000 move.d 88 ,\$r10 - 8009e: 6fae 8c00 0000 move.d 8c ,\$r10 + 80098: 6fae f8ff ffff move.d 0xfffffff8,\$r10 + 8009e: 6fae fcff ffff move.d 0xfffffffc,\$r10 000800a4 : 800a4: 6fae 5021 0800 move.d 82150 <_GLOBAL_OFFSET_TABLE_\+0xc>,\$r10 diff --git a/ld/testsuite/ld-cris/tls-legd-17.d b/ld/testsuite/ld-cris/tls-legd-17.d index 328d1fd5238..2ee21394ffd 100644 --- a/ld/testsuite/ld-cris/tls-legd-17.d +++ b/ld/testsuite/ld-cris/tls-legd-17.d @@ -39,7 +39,7 @@ Contents of section \.text: #... Contents of section \.got: 8213c 0+ 0+ 0+ 010+ .* - 8214c 80+ 010+ 840+ .* + 8214c f0ffffff 010+ f4ffffff .* Disassembly of section \.text: @@ -47,8 +47,8 @@ Disassembly of section \.text: 80094: 41b2 moveq 1,\$r11 #... 00080098 : - 80098: 5fae 8800 move.w 0x88,\$r10 - 8009c: 5fae 8c00 move.w 0x8c,\$r10 + 80098: 5fae f8ff move.w 0xfff8,\$r10 + 8009c: 5fae fcff move.w 0xfffc,\$r10 000800a0 : 800a0: 6fae 0c00 0000 move.d c ,\$r10 diff --git a/ld/testsuite/ld-cris/tls-legdx-16.d b/ld/testsuite/ld-cris/tls-legdx-16.d index 8ce4280cef2..1e3bc3ee727 100644 --- a/ld/testsuite/ld-cris/tls-legdx-16.d +++ b/ld/testsuite/ld-cris/tls-legdx-16.d @@ -44,7 +44,7 @@ OFFSET TYPE VALUE Contents of section .interp: #... Contents of section \.text: - 801dc 41b20000 6fae8000 00006fae 84000000 .* + 801dc 41b20000 6faef8ff ffff6fae fcffffff .* 801ec 6fae1023 08000000 6fae1823 08000000 .* #... Contents of section \.got: diff --git a/ld/testsuite/ld-cris/tls-legdx-17.d b/ld/testsuite/ld-cris/tls-legdx-17.d index 5a76604f7b4..1d1c5ea8007 100644 --- a/ld/testsuite/ld-cris/tls-legdx-17.d +++ b/ld/testsuite/ld-cris/tls-legdx-17.d @@ -46,7 +46,7 @@ OFFSET TYPE VALUE Contents of section .interp: #... Contents of section \.text: - 801dc 41b20000 5fae8000 5fae8400 6fae0c00 .* + 801dc 41b20000 5faef8ff 5faefcff 6fae0c00 .* 801ec 00000000 5fae1400 .* #... Contents of section \.got: diff --git a/ld/testsuite/ld-cris/tls-leie-18.d b/ld/testsuite/ld-cris/tls-leie-18.d index e4d1601d1ab..edff43c2195 100644 --- a/ld/testsuite/ld-cris/tls-leie-18.d +++ b/ld/testsuite/ld-cris/tls-leie-18.d @@ -30,8 +30,8 @@ SYMBOL TABLE: Contents of section \.text: #... Contents of section \.got: - 82130 0+ 0+ 0+ 840+ .* - 82140 80+ .... + 82130 0+ 0+ 0+ fcffffff .* + 82140 f8ffffff .* Disassembly of section \.text: @@ -39,8 +39,8 @@ Disassembly of section \.text: 80094: 41b2 moveq 1,\$r11 #... 00080098 : - 80098: 5fae 8000 move.w 0x80,\$r10 - 8009c: 5fae 8400 move.w 0x84,\$r10 + 80098: 5fae f8ff move.w 0xfff8,\$r10 + 8009c: 5fae fcff move.w 0xfffc,\$r10 000800a0 : 800a0: 5fae 1000 move.w 0x10,\$r10 diff --git a/ld/testsuite/ld-cris/tls-leie-19.d b/ld/testsuite/ld-cris/tls-leie-19.d index f294b77b9ba..6cf69b23f75 100644 --- a/ld/testsuite/ld-cris/tls-leie-19.d +++ b/ld/testsuite/ld-cris/tls-leie-19.d @@ -37,8 +37,8 @@ SYMBOL TABLE: Contents of section \.text: #... Contents of section \.got: - 82144 0+ 0+ 0+ 840+ .* - 82154 80+ .* + 82144 0+ 0+ 0+ f4ffffff .* + 82154 f0ffffff .* Disassembly of section \.text: @@ -46,11 +46,11 @@ Disassembly of section \.text: 80094: 41b2 moveq 1,\$r11 #... 00080098 : - 80098: 6fae 8800 0000 move.d 88 ,\$r10 + 80098: 6fae f8ff ffff move.d 0xfffffff8,\$r10 #... 000800a0 : - 800a0: 6fae 8c00 0000 move.d 8c ,\$r10 + 800a0: 6fae fcff ffff move.d 0xfffffffc,\$r10 #... 000800a8 : diff --git a/ld/testsuite/ld-cris/tls-local-57.d b/ld/testsuite/ld-cris/tls-local-57.d index 03899a7ec09..5756657e21e 100644 --- a/ld/testsuite/ld-cris/tls-local-57.d +++ b/ld/testsuite/ld-cris/tls-local-57.d @@ -20,4 +20,4 @@ Contents of section .text: #... Contents of section \.got: 82124 0+ 0+ 0+ 010+ .* - 82134 040+ .* + 82134 80ffffff .* diff --git a/ld/testsuite/ld-cris/tls-local-58.d b/ld/testsuite/ld-cris/tls-local-58.d index 2f68a88f317..7e130cf49b3 100644 --- a/ld/testsuite/ld-cris/tls-local-58.d +++ b/ld/testsuite/ld-cris/tls-local-58.d @@ -21,4 +21,4 @@ Contents of section .text: #... Contents of section \.got: 82128 0+ 0+ 0+ 010+ .* - 82138 040+ .* + 82138 80ffffff .* diff --git a/ld/testsuite/ld-cris/tls-local-59.d b/ld/testsuite/ld-cris/tls-local-59.d index fd033e45203..0130a977e49 100644 --- a/ld/testsuite/ld-cris/tls-local-59.d +++ b/ld/testsuite/ld-cris/tls-local-59.d @@ -21,5 +21,5 @@ Contents of section .text: 800a4 5fae1000 5fae0c00 .* #... Contents of section \.got: - 82130 0+ 0+ 0+ 040+ .* - 82140 010+ 040+ .* + 82130 0+ 0+ 0+ 80ffffff .* + 82140 010+ 80ffffff .* diff --git a/ld/testsuite/ld-cris/tls-ok-36.d b/ld/testsuite/ld-cris/tls-ok-36.d index 506f7c900f1..fcfecb9a8c0 100644 --- a/ld/testsuite/ld-cris/tls-ok-36.d +++ b/ld/testsuite/ld-cris/tls-ok-36.d @@ -9,7 +9,7 @@ .*: file format elf32-cris Contents of section \.text: - 80094 41b20000 5faeff7f .* + 80094 41b20000 5fae0080 .* Contents of section \.tdata: 8209c 2a2a2a2a 2a2a2a2a 2a2a2a2a 2a2a2a2a .* #... diff --git a/ld/testsuite/ld-cris/tls-tprelm.s b/ld/testsuite/ld-cris/tls-tprelm.s index 7d03ddd026c..93fd671311c 100644 --- a/ld/testsuite/ld-cris/tls-tprelm.s +++ b/ld/testsuite/ld-cris/tls-tprelm.s @@ -12,15 +12,15 @@ tlsfntprelm: .Lfe: .size tlsfntprelm,.Lfe-tlsfntprelm - .globl z .section .tdata,"awT",@progbits .p2align 2 - .type z,@object - .size z,r -z: - .fill r,1,42 - .type x,@object .size x,1 x: .byte 42 + + .globl z + .type z,@object + .size z,r +z: + .fill r,1,42 -- 2.30.2