aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2011-06-29 23:49:12 +0000
committerBill Wendling <isanbard@gmail.com>2011-06-29 23:49:12 +0000
commit9056e9032001a2d47057cecec5e39895cbc31799 (patch)
treec059c664962aa2bbd30a47f484b9a4360740cb35 /lib
parentf6fd90910a552ad9883f031350ae517e26dfdb44 (diff)
downloadexternal_llvm-9056e9032001a2d47057cecec5e39895cbc31799.zip
external_llvm-9056e9032001a2d47057cecec5e39895cbc31799.tar.gz
external_llvm-9056e9032001a2d47057cecec5e39895cbc31799.tar.bz2
We don't want to use relocations inside the compact unwind section. Just use the
symbols instead. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134115 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/MC/MCDwarf.cpp23
1 files changed, 19 insertions, 4 deletions
diff --git a/lib/MC/MCDwarf.cpp b/lib/MC/MCDwarf.cpp
index d232d84..14a1081 100644
--- a/lib/MC/MCDwarf.cpp
+++ b/lib/MC/MCDwarf.cpp
@@ -637,9 +637,6 @@ bool FrameEmitterImpl::EmitCompactUnwind(MCStreamer &Streamer,
const TargetAsmInfo &TAI = Context.getTargetAsmInfo();
Streamer.SwitchSection(TAI.getCompactUnwindSection());
- unsigned FDEEncoding = TAI.getFDEEncoding(UsingCFI);
- unsigned Size = getSizeForEncoding(Streamer, FDEEncoding);
-
// range-start range-length compact-unwind-enc personality-func lsda
// _foo LfooEnd-_foo 0x00000023 0 0
// _bar LbarEnd-_bar 0x00000025 __gxx_personality except_tab1
@@ -663,13 +660,31 @@ bool FrameEmitterImpl::EmitCompactUnwind(MCStreamer &Streamer,
// .quad except_tab1
// Range Start
- EmitSymbol(Streamer, *Frame.Begin, FDEEncoding);
+ unsigned FDEEncoding = TAI.getFDEEncoding(UsingCFI);
+ unsigned Size = getSizeForEncoding(Streamer, FDEEncoding);
+ Streamer.EmitSymbolValue(Frame.Function, Size);
// Range Length
const MCExpr *Range = MakeStartMinusEndExpr(Streamer, *Frame.Begin,
*Frame.End, 0);
Streamer.EmitAbsValue(Range, Size);
+ // Personality Function
+ if (Frame.Personality) {
+ Size = getSizeForEncoding(Streamer, Frame.PersonalityEncoding);
+ Streamer.EmitSymbolValue(Frame.Personality, Size);
+ } else {
+ Streamer.EmitIntValue(Frame.PersonalityEncoding, 0); // No personality fn
+ }
+
+ // LSDA
+ if (Frame.Lsda) {
+ Size = getSizeForEncoding(Streamer, Frame.LsdaEncoding);
+ Streamer.EmitSymbolValue(Frame.Lsda, Size);
+ } else {
+ Streamer.EmitIntValue(Frame.LsdaEncoding, 0); // No LSDA
+ }
+
return true;
#endif
}