diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2012-02-17 17:31:15 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2012-02-17 17:31:15 +0000 |
| commit | 4cbcee16187ab07a70280fc10af327767325b848 (patch) | |
| tree | a42476bbae2af577850c4775462f3744f2c3c05a | |
| parent | 8bb51ef6d2a396715f1dbc6edc1599892779e4d6 (diff) | |
| download | external_llvm-4cbcee16187ab07a70280fc10af327767325b848.zip external_llvm-4cbcee16187ab07a70280fc10af327767325b848.tar.gz external_llvm-4cbcee16187ab07a70280fc10af327767325b848.tar.bz2 | |
Generate the correct EH frame section types on Solaris, this time without breaking other platforms...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@150819 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/MC/MCObjectFileInfo.h | 2 | ||||
| -rw-r--r-- | lib/MC/MCObjectFileInfo.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/llvm/MC/MCObjectFileInfo.h b/include/llvm/MC/MCObjectFileInfo.h index e58e7d6..5d5801f 100644 --- a/include/llvm/MC/MCObjectFileInfo.h +++ b/include/llvm/MC/MCObjectFileInfo.h @@ -47,6 +47,8 @@ protected: unsigned FDEEncoding; unsigned FDECFIEncoding; unsigned TTypeEncoding; + // Section flags for eh_frame + unsigned EHSectionFlags; /// TextSection - Section directive for standard text. /// diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp index 1b86535..1a27df5 100644 --- a/lib/MC/MCObjectFileInfo.cpp +++ b/lib/MC/MCObjectFileInfo.cpp @@ -258,6 +258,13 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) { } } + // Solaris requires different flags for .eh_frame to seemingly every other + // platform. + EHSectionFlags = ELF::SHF_ALLOC; + if (T.getOS() == Triple::Solaris) + EHSectionFlags |= ELF::SHF_WRITE; + + // ELF BSSSection = Ctx->getELFSection(".bss", ELF::SHT_NOBITS, @@ -559,7 +566,7 @@ void MCObjectFileInfo::InitEHFrameSection() { else if (Env == IsELF) EHFrameSection = Ctx->getELFSection(".eh_frame", ELF::SHT_PROGBITS, - ELF::SHF_ALLOC, + EHSectionFlags, SectionKind::getDataRel()); else EHFrameSection = |