From ad5fec3b3a1e529a7056e15f271851bd0dfb10fa Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 9 Oct 2008 17:31:43 +0000 Subject: [PATCH] * dw2gencfi.c (cfi_finish): Deal with md_fix_up_eh_frame. * config/tc-i386.h (md_fix_up_eh_frame): Define on Solaris. (i386_solaris_fix_up_eh_frame): Declare. * config/tc-i386.c (i386_solaris_fix_up_eh_frame): New function. --- gas/ChangeLog | 7 +++++++ gas/config/tc-i386.c | 9 +++++++++ gas/config/tc-i386.h | 5 +++++ gas/dw2gencfi.c | 4 ++++ 4 files changed, 25 insertions(+) diff --git a/gas/ChangeLog b/gas/ChangeLog index c53448a5ba1..a3b056bee21 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2008-10-09 Eric Botcazou + + * dw2gencfi.c (cfi_finish): Deal with md_fix_up_eh_frame. + * config/tc-i386.h (md_fix_up_eh_frame): Define on Solaris. + (i386_solaris_fix_up_eh_frame): Declare. + * config/tc-i386.c (i386_solaris_fix_up_eh_frame): New function. + 2008-10-09 Nick Clifton PR 6944 diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 539ea795122..df76ae93800 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -10105,6 +10105,15 @@ i386_elf_section_type (const char *str, size_t len) return -1; } +#ifdef TE_SOLARIS +void +i386_solaris_fix_up_eh_frame (segT sec) +{ + if (flag_code == CODE_64BIT) + elf_section_type (sec) = SHT_X86_64_UNWIND; +} +#endif + #ifdef TE_PE void tc_pe_dwarf2_emit_offset (symbolS *symbol, unsigned int size) diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h index a670ff917db..fd8c8ecf73d 100644 --- a/gas/config/tc-i386.h +++ b/gas/config/tc-i386.h @@ -212,6 +212,11 @@ extern void tc_x86_frame_initial_instructions (void); #define md_elf_section_type(str,len) i386_elf_section_type (str, len) extern int i386_elf_section_type (const char *, size_t); +#ifdef TE_SOLARIS +#define md_fix_up_eh_frame(sec) i386_solaris_fix_up_eh_frame (sec) +extern void i386_solaris_fix_up_eh_frame (segT); +#endif + /* Support for SHF_X86_64_LARGE */ extern int x86_64_section_word (char *, size_t); extern int x86_64_section_letter (int, char **); diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c index 12a656fe93d..4adfeab9750 100644 --- a/gas/dw2gencfi.c +++ b/gas/dw2gencfi.c @@ -1496,6 +1496,10 @@ cfi_finish (void) subseg_set (cfi_seg, 0); record_alignment (cfi_seg, EH_FRAME_ALIGNMENT); +#ifdef md_fix_up_eh_frame + md_fix_up_eh_frame (cfi_seg); +#endif + /* Make sure check_eh_frame doesn't do anything with our output. */ save_flag_traditional_format = flag_traditional_format; flag_traditional_format = 1; -- 2.30.2