From 0b0d89d744b58a70a4fef6f80d7ff9d49e02ebb4 Mon Sep 17 00:00:00 2001 From: Dave Korn Date: Thu, 3 Sep 2009 18:04:35 +0000 Subject: [PATCH] ld/ChangeLog: * scripttempl/pe.sc (.text): Add "*(.text.*)" in order to catch new GCC hot/cold/unlikely partitions. * scripttempl/pep.sc: Likewise. * scripttempl/epocpe.sc: Likewise. * scripttempl/mcorepe.sc: Likewise. * scripttempl/ppcpe.sc: Likewise. ld/testsuite/ChangeLog: * ld-pe/longsecn.d: Adjusted to match new .text section merging in default PE linker scripts. * ld-pe/longsecn-1.d: Likewise. * ld-pe/longsecn-2.d: Likewise. --- ld/ChangeLog | 9 +++++++++ ld/scripttempl/epocpe.sc | 1 + ld/scripttempl/mcorepe.sc | 1 + ld/scripttempl/pe.sc | 1 + ld/scripttempl/pep.sc | 1 + ld/scripttempl/ppcpe.sc | 1 + ld/testsuite/ChangeLog | 7 +++++++ ld/testsuite/ld-pe/longsecn-1.d | 12 +++++------- ld/testsuite/ld-pe/longsecn-2.d | 12 +++++------- ld/testsuite/ld-pe/longsecn.d | 12 +++++------- 10 files changed, 36 insertions(+), 21 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index bae7066458..287b5308d8 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2009-09-03 Dave Korn + + * scripttempl/pe.sc (.text): Add "*(.text.*)" in order to catch + new GCC hot/cold/unlikely partitions. + * scripttempl/pep.sc: Likewise. + * scripttempl/epocpe.sc: Likewise. + * scripttempl/mcorepe.sc: Likewise. + * scripttempl/ppcpe.sc: Likewise. + 2009-09-01 Ralf Wildenhues * Makefile.am (ldgram.o, ldlex.o, deffilep.o): Supply correct diff --git a/ld/scripttempl/epocpe.sc b/ld/scripttempl/epocpe.sc index eda6696b59..34aebf6f94 100644 --- a/ld/scripttempl/epocpe.sc +++ b/ld/scripttempl/epocpe.sc @@ -52,6 +52,7 @@ SECTIONS ${R_TEXT} *(.glue_7t) *(.glue_7) + ${RELOCATING+ *(.text.*)} ${CONSTRUCTING+ ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; LONG (-1); *(.ctors); *(.ctor); LONG (0); } ${CONSTRUCTING+ ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; diff --git a/ld/scripttempl/mcorepe.sc b/ld/scripttempl/mcorepe.sc index 6f928aadd2..5b10881cd8 100644 --- a/ld/scripttempl/mcorepe.sc +++ b/ld/scripttempl/mcorepe.sc @@ -56,6 +56,7 @@ SECTIONS ${RELOCATING+ *(.init)} *(.text) ${R_TEXT} + ${RELOCATING+ *(.text.*)} *(.glue_7t) *(.glue_7) ${CONSTRUCTING+ ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc index 687efb0438..0d59aa0b13 100644 --- a/ld/scripttempl/pe.sc +++ b/ld/scripttempl/pe.sc @@ -69,6 +69,7 @@ SECTIONS ${RELOCATING+ *(.init)} *(.text) ${R_TEXT} + ${RELOCATING+ *(.text.*)} *(.glue_7t) *(.glue_7) ${CONSTRUCTING+ ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; diff --git a/ld/scripttempl/pep.sc b/ld/scripttempl/pep.sc index b39469ddb5..c6eb06c3b0 100644 --- a/ld/scripttempl/pep.sc +++ b/ld/scripttempl/pep.sc @@ -69,6 +69,7 @@ SECTIONS ${RELOCATING+ *(.init)} *(.text) ${R_TEXT} + ${RELOCATING+ *(.text.*)} *(.glue_7t) *(.glue_7) ${CONSTRUCTING+. = ALIGN(8);} diff --git a/ld/scripttempl/ppcpe.sc b/ld/scripttempl/ppcpe.sc index 40fbe33bb7..83e260930c 100644 --- a/ld/scripttempl/ppcpe.sc +++ b/ld/scripttempl/ppcpe.sc @@ -32,6 +32,7 @@ SECTIONS { ${RELOCATING+ *(.init);} *(.text) + ${RELOCATING+ *(.text.*)} *(.gcc_except_table) ${CONSTRUCTING+ ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; LONG (-1); *(.ctors); *(.ctor); LONG (0); } diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 20c910641c..fcd40e65df 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2009-09-03 Dave Korn + + * ld-pe/longsecn.d: Adjusted to match new .text section merging + in default PE linker scripts. + * ld-pe/longsecn-1.d: Likewise. + * ld-pe/longsecn-2.d: Likewise. + 2009-08-31 Jie Zhang * lib/ld-lib.exp (is_elf_format): Return 1 for bfin-*-uclinux. diff --git a/ld/testsuite/ld-pe/longsecn-1.d b/ld/testsuite/ld-pe/longsecn-1.d index f860f1e599..95b3337de3 100755 --- a/ld/testsuite/ld-pe/longsecn-1.d +++ b/ld/testsuite/ld-pe/longsecn-1.d @@ -8,17 +8,15 @@ Sections: Idx Name Size VMA +LMA +File off Algn 0 \.text [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] - CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 \.text\.ve [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, READONLY, CODE, DATA - 2 \.data [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 1 \.data [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 3 \.rodata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 2 \.rodata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 4 \.data\.ve [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 3 \.data\.ve [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 5 \.rodata\. [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 4 \.rodata\. [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 6 \.idata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 5 \.idata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA diff --git a/ld/testsuite/ld-pe/longsecn-2.d b/ld/testsuite/ld-pe/longsecn-2.d index 278dc75618..8170006f84 100755 --- a/ld/testsuite/ld-pe/longsecn-2.d +++ b/ld/testsuite/ld-pe/longsecn-2.d @@ -8,16 +8,14 @@ Sections: Idx Name Size VMA +LMA +File off Algn 0 \.text [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] - CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 \.text\.very\.long\.section\.name [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, READONLY, CODE, DATA - 2 \.data [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 1 \.data [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 3 \.rodata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 2 \.rodata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 4 \.data\.very\.long\.section [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 3 \.data\.very\.long\.section [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 5 \.rodata\.very.long\.section [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 4 \.rodata\.very.long\.section [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 6 \.idata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 5 \.idata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA diff --git a/ld/testsuite/ld-pe/longsecn.d b/ld/testsuite/ld-pe/longsecn.d index 92269faff8..2dcde3533a 100755 --- a/ld/testsuite/ld-pe/longsecn.d +++ b/ld/testsuite/ld-pe/longsecn.d @@ -8,17 +8,15 @@ Sections: Idx Name Size VMA +LMA +File off Algn 0 \.text [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] - CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 \.text\.ve [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, READONLY, CODE, DATA - 2 \.data [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 1 \.data [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 3 \.rodata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 2 \.rodata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 4 \.data\.ve [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 3 \.data\.ve [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 5 \.rodata\. [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 4 \.rodata\. [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA - 6 \.idata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] + 5 \.idata [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ 2\*\*[0-9] CONTENTS, ALLOC, LOAD, DATA -- 2.11.0