From fafd78e9a53bb84d04697f3ad2f5a0e8c6063a76 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 4 Jun 2013 16:08:51 +0000 Subject: [PATCH] Update x86 nacl tests for section alignment change * ld-i386/tlsbindesc-nacl.rd: Updated for text/data/bss section alignment change. * ld-x86-64/split-by-file-nacl.rd: Likewise. --- ld/testsuite/ChangeLog | 6 ++++++ ld/testsuite/ld-i386/tlsbindesc-nacl.rd | 4 ++-- ld/testsuite/ld-x86-64/split-by-file-nacl.rd | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 8c4a5f0ca98..3bfea87f268 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-06-04 H.J. Lu + + * ld-i386/tlsbindesc-nacl.rd: Updated for text/data/bss section + alignment change. + * ld-x86-64/split-by-file-nacl.rd: Likewise. + 2013-05-31 H.J. Lu * ld-i386/pr12718.d: Updated for text/data/bss section alignment diff --git a/ld/testsuite/ld-i386/tlsbindesc-nacl.rd b/ld/testsuite/ld-i386/tlsbindesc-nacl.rd index e3b434009f1..7399309ad40 100644 --- a/ld/testsuite/ld-i386/tlsbindesc-nacl.rd +++ b/ld/testsuite/ld-i386/tlsbindesc-nacl.rd @@ -30,7 +30,7 @@ Key to Flags: .* Elf file type is EXEC \(Executable file\) -Entry point 0x0*20158 +Entry point 0x0*20156 There are [0-9]+ program headers, starting at offset [0-9]+ Program Headers: @@ -134,7 +134,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 00000058 +0 +TLS +GLOBAL +HIDDEN +7 sh7 +[0-9]+: 0000005c +0 +TLS +GLOBAL +HIDDEN +7 sh8 +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1 - +[0-9]+: 0+20158 +0 +FUNC +GLOBAL +DEFAULT +1 _start + +[0-9]+: 0+20156 +0 +FUNC +GLOBAL +DEFAULT +1 _start +[0-9]+: 0000004c +0 +TLS +GLOBAL +HIDDEN +7 sh4 +[0-9]+: 00000078 +0 +TLS +GLOBAL +DEFAULT +8 bg7 +[0-9]+: 00000050 +0 +TLS +GLOBAL +HIDDEN +7 sh5 diff --git a/ld/testsuite/ld-x86-64/split-by-file-nacl.rd b/ld/testsuite/ld-x86-64/split-by-file-nacl.rd index 897ab0f806c..6cc810133e1 100644 --- a/ld/testsuite/ld-x86-64/split-by-file-nacl.rd +++ b/ld/testsuite/ld-x86-64/split-by-file-nacl.rd @@ -3,12 +3,12 @@ There are 9 section headers, starting at offset 0x80: Section Headers: \[Nr\] Name Type Address Off Size ES Flg Lk Inf Al \[ 0\] NULL 0000000000000000 000000 000000 00 0 0 0 - \[ 1\] .text PROGBITS 0000000000000000 000040 000000 00 AX 0 0 4 + \[ 1\] .text PROGBITS 0000000000000000 000040 000000 00 AX 0 0 1 \[ 2\] .foo PROGBITS 0000000000000000 000040 000003 00 AXl 0 0 1 - \[ 3\] .data PROGBITS 0000000000000000 000044 000000 00 WA 0 0 4 - \[ 4\] .bss NOBITS 0000000000000000 000044 000000 00 WA 0 0 4 - \[ 5\] .foo.0 PROGBITS 0000000000000003 000044 000003 00 AXl 0 0 1 - \[ 6\] .shstrtab STRTAB 0000000000000000 000047 000038 00 0 0 1 + \[ 3\] .data PROGBITS 0000000000000000 000043 000000 00 WA 0 0 1 + \[ 4\] .bss NOBITS 0000000000000000 000043 000000 00 WA 0 0 1 + \[ 5\] .foo.0 PROGBITS 0000000000000003 000043 000003 00 AXl 0 0 1 + \[ 6\] .shstrtab STRTAB 0000000000000000 000046 000038 00 0 0 1 \[ 7\] .symtab SYMTAB 0000000000000000 [0-9a-f]+ [0-9a-f]+ 18 8 [0-9] 8 \[ 8\] .strtab STRTAB 0000000000000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 Key to Flags: -- 2.30.2