From 2279a12a44ede7a0a6d7375d90d33676fa8771ad Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 8 Jan 2015 14:10:36 +0100 Subject: [PATCH] ld/x86-64: adjust pr14207 test expectations The original test output expectations cause it to fail when configure determines enable_initfini_array=no (which was observed on a cross build on an old 32-bit host, pointing out that taking into account host properties in such a case is bogus anyway). ld/testsuite/ 2015-01-08 Jan Beulich * ld-x86-64/pr14207.d: Adjust expecations to cover the enable_initfini_array=no case. --- ld/testsuite/ChangeLog | 5 +++++ ld/testsuite/ld-x86-64/pr14207.d | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index c9b3ecb..229e006 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-01-08 Jan Beulich + + * ld-x86-64/pr14207.d: Adjust expecations to cover the + enable_initfini_array=no case. + 2015-01-06 Andrew Burgess * lib/ld-lib.exp (run_dump_test): Extend comment to mention diff --git a/ld/testsuite/ld-x86-64/pr14207.d b/ld/testsuite/ld-x86-64/pr14207.d index d4e22a1..429c998 100644 --- a/ld/testsuite/ld-x86-64/pr14207.d +++ b/ld/testsuite/ld-x86-64/pr14207.d @@ -11,14 +11,14 @@ There are 4 program headers, starting at offset 64 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align LOAD 0x000000 0x0000000000000000 0x0000000000000000 0x0001e0 0x0001e0 R 0x200000 - LOAD 0x000b48 0x0000000000200b48 0x0000000000200b48 0x0004b0 0x000cf8 RW 0x200000 - DYNAMIC 0x000b90 0x0000000000200b90 0x0000000000200b90 0x0001c0 0x0001c0 RW 0x8 - GNU_RELRO 0x000b48 0x0000000000200b48 0x0000000000200b48 0x0004b8 0x0004b8 R 0x1 + LOAD 0x000b.8 0x0000000000200b.8 0x0000000000200b.8 0x0004.0 0x000c.8 RW 0x200000 + DYNAMIC 0x000b.0 0x0000000000200b.0 0x0000000000200b.0 0x0001.0 0x0001.0 RW 0x8 + GNU_RELRO 0x000b.8 0x0000000000200b.8 0x0000000000200b.8 0x0004.8 0x0004.8 R 0x1 Section to Segment mapping: Segment Sections... - 00 .hash .dynsym .dynstr - 01 .init_array .fini_array .jcr .data.rel.ro .dynamic .got .bss - 02 .dynamic - 03 .init_array .fini_array .jcr .data.rel.ro .dynamic .got + 00 \.hash \.dynsym \.dynstr + 01 \.(init_array|ctors) \.(fini_array|dtors) \.jcr \.data\.rel\.ro \.dynamic \.got .bss + 02 \.dynamic + 03 \.(init_array|ctors) \.(fini_array|dtors) \.jcr \.data\.rel\.ro \.dynamic \.got #pass -- 2.7.4