aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2014-04-24 08:48:34 +0000
committerRainer Orth <ro@gcc.gnu.org>2014-04-24 08:48:34 +0000
commit8117ef9898d4a3d55e1fe64a1d4c0a6d0dfaa00c (patch)
tree6e16f4865c684894aa5ab48381a7c649663d4cd4 /gcc
parentab0afae309610d5a0ddcdf346e1927dcf9e50066 (diff)
downloadgcc-8117ef9898d4a3d55e1fe64a1d4c0a6d0dfaa00c.zip
gcc-8117ef9898d4a3d55e1fe64a1d4c0a6d0dfaa00c.tar.gz
gcc-8117ef9898d4a3d55e1fe64a1d4c0a6d0dfaa00c.tar.bz2
Only redefine ASM_PREFERRED_EH_DATA_FORMAT if necessary on Solaris/x86
* config/i386/sol2.h (ASM_PREFERRED_EH_DATA_FORMAT): Only redefine if not HAVE_AS_IX86_DIFF_SECT_DELTA. From-SVN: r209740
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/i386/sol2.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2afb950..21a5b3e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2014-04-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+ * config/i386/sol2.h (ASM_PREFERRED_EH_DATA_FORMAT): Only redefine
+ if not HAVE_AS_IX86_DIFF_SECT_DELTA.
+
+2014-04-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
* configure.ac (gcc_cv_as_cfi_directive): Support Solaris/x86
assembler 64-bit option.
* configure: Regenerate.
diff --git a/gcc/config/i386/sol2.h b/gcc/config/i386/sol2.h
index 8a21a59..6676941 100644
--- a/gcc/config/i386/sol2.h
+++ b/gcc/config/i386/sol2.h
@@ -26,13 +26,15 @@ along with GCC; see the file COPYING3. If not see
(MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_VECT8_RETURNS)
/* Old versions of the Solaris assembler can not handle the difference of
- labels in different sections, so force DW_EH_PE_datarel. */
+ labels in different sections, so force DW_EH_PE_datarel if so. */
+#ifndef HAVE_AS_IX86_DIFF_SECT_DELTA
#undef ASM_PREFERRED_EH_DATA_FORMAT
#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \
(flag_pic ? ((GLOBAL ? DW_EH_PE_indirect : 0) \
| (TARGET_64BIT ? DW_EH_PE_pcrel | DW_EH_PE_sdata4 \
: DW_EH_PE_datarel)) \
: DW_EH_PE_absptr)
+#endif
/* The Solaris linker will not merge a read-only .eh_frame section
with a read-write .eh_frame section. None of the encodings used