summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@libertysurf.fr>2008-10-09 17:31:43 +0000
committerEric Botcazou <ebotcazou@libertysurf.fr>2008-10-09 17:31:43 +0000
commit40ec2f490798aa8cbdfe3b5f293eadb0e034971b (patch)
treec704f2b2f0c59918c105439246764ca206cc4cb8
parente312d9dc6c10c2969bf303ab989c252c0eacaed7 (diff)
downloadbinutils-redhat-40ec2f490798aa8cbdfe3b5f293eadb0e034971b.tar.gz
* 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.
-rw-r--r--gas/ChangeLog7
-rw-r--r--gas/config/tc-i386.c9
-rw-r--r--gas/config/tc-i386.h5
-rw-r--r--gas/dw2gencfi.c4
4 files changed, 25 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index c53448a5ba..a3b056bee2 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-09 Eric Botcazou <ebotcazou@adacore.com>
+
+ * 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 <nickc@redhat.com>
PR 6944
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 539ea79512..df76ae9380 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 a670ff917d..fd8c8ecf73 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 12a656fe93..4adfeab975 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;