diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2013-08-13 01:23:53 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2013-08-13 01:23:53 +0000 |
| commit | 3d96acb7351c3bb56d25889601a0f160fdfe9482 (patch) | |
| tree | 67b04576a3c7a33aeba90f8e18026d06999cbbef /llvm | |
| parent | d29614f98db4a31bcb1a76b0bad691a016cc035f (diff) | |
| download | bcm5719-llvm-3d96acb7351c3bb56d25889601a0f160fdfe9482.tar.gz bcm5719-llvm-3d96acb7351c3bb56d25889601a0f160fdfe9482.zip | |
[-cxx-abi microsoft] Stick zero initialized symbols into the .bss section for COFF
Summary:
We need to do two things:
- Initialize BSSSection in MCObjectFileInfo::InitCOFFMCObjectFileInfo
- Teach TargetLoweringObjectFileCOFF::SelectSectionForGlobal what to do
with it
This fixes PR16861.
Reviewers: rnk
Reviewed By: rnk
CC: llvm-commits
Differential Revision: http://llvm-reviews.chandlerc.com/D1361
llvm-svn: 188244
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 11 | ||||
| -rw-r--r-- | llvm/lib/MC/MCObjectFileInfo.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/MC/COFF/bss_section.ll | 6 |
3 files changed, 19 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp index ea0d62e6ef3..085e8f40186 100644 --- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp +++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp @@ -771,15 +771,18 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind, } if (Kind.isText()) - return getTextSection(); + return TextSection; if (Kind.isThreadLocal()) - return getTLSDataSection(); + return TLSDataSection; - if (Kind.isReadOnly() && ReadOnlySection != 0) + if (Kind.isReadOnly()) return ReadOnlySection; - return getDataSection(); + if (Kind.isBSS()) + return BSSSection; + + return DataSection; } void TargetLoweringObjectFileCOFF:: diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp index bcf52d2368a..819c00b180c 100644 --- a/llvm/lib/MC/MCObjectFileInfo.cpp +++ b/llvm/lib/MC/MCObjectFileInfo.cpp @@ -496,6 +496,12 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) { void MCObjectFileInfo::InitCOFFMCObjectFileInfo(Triple T) { // COFF + BSSSection = + Ctx->getCOFFSection(".bss", + COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA | + COFF::IMAGE_SCN_MEM_READ | + COFF::IMAGE_SCN_MEM_WRITE, + SectionKind::getBSS()); TextSection = Ctx->getCOFFSection(".text", COFF::IMAGE_SCN_CNT_CODE | diff --git a/llvm/test/MC/COFF/bss_section.ll b/llvm/test/MC/COFF/bss_section.ll new file mode 100644 index 00000000000..60924f13064 --- /dev/null +++ b/llvm/test/MC/COFF/bss_section.ll @@ -0,0 +1,6 @@ +; RUN: llc -mtriple i386-pc-win32 < %s | FileCheck %s + +%struct.foo = type { i32, i32 } + +@"\01?thingy@@3Ufoo@@B" = global %struct.foo zeroinitializer, align 4 +; CHECK: .bss |

