From dd52c6dee232ec529d5a52ae0d40842f0d0cfc66 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Fri, 31 Jul 2009 04:55:48 +0000 Subject: [PATCH] * ld-mmix/x.s, ld-mmix/y.s, ld-mmix/zeroeh.ld, ld-mmix/zeroehelf.d, ld-mmix/zeroehmmo.d: Use .gcc_except_table, not .eh_frame. --- ld/testsuite/ChangeLog | 6 ++++++ ld/testsuite/ld-mmix/x.s | 9 ++++++--- ld/testsuite/ld-mmix/y.s | 6 +++--- ld/testsuite/ld-mmix/zeroeh.ld | 2 +- ld/testsuite/ld-mmix/zeroehelf.d | 2 +- ld/testsuite/ld-mmix/zeroehmmo.d | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index e22765dfb8..525bc8e119 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2009-07-31 Hans-Peter Nilsson + + * ld-mmix/x.s, ld-mmix/y.s, ld-mmix/zeroeh.ld, + ld-mmix/zeroehelf.d, ld-mmix/zeroehmmo.d: Use .gcc_except_table, + not .eh_frame. + 2009-07-30 H.J. Lu * ld-elf/shared.exp: Comment out dl3b. diff --git a/ld/testsuite/ld-mmix/x.s b/ld/testsuite/ld-mmix/x.s index faf4073d42..e7222b1db0 100644 --- a/ld/testsuite/ld-mmix/x.s +++ b/ld/testsuite/ld-mmix/x.s @@ -1,8 +1,11 @@ ;# Main file, x.s, with the program (_start) referring to two ;# linkonce functions fn and fn2. The functions fn and fn2 are ;# supposed to be equivalent of C++ template instantiations; the -;# main file instantiates fn. There's the equivalent of an FDE -;# entry in .eh_frame, referring to fn via a local label. +;# main file instantiates fn. An exception-table-lookalike entry +;# refers to fn via a local label. We use .gcc_except_table as we +;# can't be bothered to produce syntactically valid .eh_frame contents +;# and there's no option to turn off warning messages for invalid +;# contents. .text .global _start @@ -20,7 +23,7 @@ L:a: L:b: .size fn,L:b-L:a - .section .eh_frame,"aw",@progbits + .section .gcc_except_table,"aw",@progbits .long 2 .long L:a .long L:b-L:a diff --git a/ld/testsuite/ld-mmix/y.s b/ld/testsuite/ld-mmix/y.s index fcfcd35217..1773d67346 100644 --- a/ld/testsuite/ld-mmix/y.s +++ b/ld/testsuite/ld-mmix/y.s @@ -2,8 +2,8 @@ ;# that this version of fn has different code, as if compiled ;# with different optimization flags than the one in x.s (not ;# important for this test, though). The reference from -;# .eh_frame to the linkonce-excluded fn2 must be zero, or g++ -;# EH will not work. +;# .gcc_except_table to the linkonce-excluded fn2 must be zero, +;# or g++ EH will not work. .section .gnu.linkonce.t.fn2,"ax",@progbits .weak fn2 @@ -23,7 +23,7 @@ L:e: L:f: .size fn,L:f-L:e - .section .eh_frame,"aw",@progbits + .section .gcc_except_table,"aw",@progbits .long 7 .long L:c .long L:d-L:c diff --git a/ld/testsuite/ld-mmix/zeroeh.ld b/ld/testsuite/ld-mmix/zeroeh.ld index 6550c17db9..efdab4d252 100644 --- a/ld/testsuite/ld-mmix/zeroeh.ld +++ b/ld/testsuite/ld-mmix/zeroeh.ld @@ -1,4 +1,4 @@ SECTIONS { .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) } - .eh_frame 0x2000 : { *(.eh_frame) } + .gcc_except_table 0x2000 : { *(.gcc_except_table) } } diff --git a/ld/testsuite/ld-mmix/zeroehelf.d b/ld/testsuite/ld-mmix/zeroehelf.d index ba17314089..729923449a 100644 --- a/ld/testsuite/ld-mmix/zeroehelf.d +++ b/ld/testsuite/ld-mmix/zeroehelf.d @@ -10,7 +10,7 @@ Contents of section \.text: 0a00 00000a08 00000a10 00000001 00000002 .* 0a10 00000003 .* -Contents of section \.eh_frame: +Contents of section \.gcc_except_table: 2000 00000002 00000a08 00000008 00000007 .* 2010 00000a10 00000004 00006066 00000000 .* 2020 00000004 .* diff --git a/ld/testsuite/ld-mmix/zeroehmmo.d b/ld/testsuite/ld-mmix/zeroehmmo.d index 2c47ff108e..1b76532d65 100644 --- a/ld/testsuite/ld-mmix/zeroehmmo.d +++ b/ld/testsuite/ld-mmix/zeroehmmo.d @@ -10,7 +10,7 @@ Contents of section \.text: 0a00 00000a08 00000a10 00000001 00000002 .* 0a10 00000003 .* -Contents of section \.eh_frame: +Contents of section \.gcc_except_table: 2000 00000002 00000a08 00000008 00000007 .* 2010 00000a10 00000004 00006066 00000000 .* 2020 00000004 .* -- 2.34.1