summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-11-27 17:13:56 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-11-27 17:13:56 +0000
commitd11591b293ed4b5ead18866c88288d6daebb1f4c (patch)
treef5b477321278b432990307b0c9eb42888ec9578a /llvm/lib
parentb3323f0bd9bcc445d71631ea958e84dee1f103ae (diff)
downloadbcm5719-llvm-d11591b293ed4b5ead18866c88288d6daebb1f4c.tar.gz
bcm5719-llvm-d11591b293ed4b5ead18866c88288d6daebb1f4c.zip
Commit back the correct bits of r222760 (was r222538).
I also added a test. Original message: Allow FDE references outside the +/-2GB range supported by PC relative offsets for code models other than small/medium. For JIT application, memory layout is less controlled and can result in truncations otherwise. Patch from Akos Kiss. Differential Revision: http://reviews.llvm.org/D6079 llvm-svn: 222897
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/MC/MCObjectFileInfo.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp
index 7886ab62ca5..858181dd4af 100644
--- a/llvm/lib/MC/MCObjectFileInfo.cpp
+++ b/llvm/lib/MC/MCObjectFileInfo.cpp
@@ -273,6 +273,12 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) {
case Triple::mips64el:
FDECFIEncoding = dwarf::DW_EH_PE_sdata8;
break;
+ case Triple::x86_64:
+ FDECFIEncoding = dwarf::DW_EH_PE_pcrel |
+ ((CMModel == CodeModel::Large) ? dwarf::DW_EH_PE_sdata8
+ : dwarf::DW_EH_PE_sdata4);
+
+ break;
default:
FDECFIEncoding = dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4;
break;
OpenPOWER on IntegriCloud