diff options
| author | dim <dim@FreeBSD.org> | 2015-05-27 20:26:41 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-05-27 20:26:41 +0000 |
| commit | 5ef8fd3549d38e883a31881636be3dc2a275de20 (patch) | |
| tree | bd13a22d9db57ccf3eddbc07b32c18109521d050 /contrib/llvm/lib/MC/MCAsmInfoELF.cpp | |
| parent | 77794ebe2d5718eb502c93ec32f8ccae4d8a0b7b (diff) | |
| parent | 782067d0278612ee75d024b9b135c221c327e9e8 (diff) | |
| download | FreeBSD-src-5ef8fd3549d38e883a31881636be3dc2a275de20.zip FreeBSD-src-5ef8fd3549d38e883a31881636be3dc2a275de20.tar.gz | |
Merge llvm trunk r238337 from ^/vendor/llvm/dist, resolve conflicts, and
preserve our customizations, where necessary.
Diffstat (limited to 'contrib/llvm/lib/MC/MCAsmInfoELF.cpp')
| -rw-r--r-- | contrib/llvm/lib/MC/MCAsmInfoELF.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/llvm/lib/MC/MCAsmInfoELF.cpp b/contrib/llvm/lib/MC/MCAsmInfoELF.cpp index 2fe626e..2bff6e0 100644 --- a/contrib/llvm/lib/MC/MCAsmInfoELF.cpp +++ b/contrib/llvm/lib/MC/MCAsmInfoELF.cpp @@ -20,10 +20,8 @@ using namespace llvm; void MCAsmInfoELF::anchor() { } -const MCSection * -MCAsmInfoELF::getNonexecutableStackSection(MCContext &Ctx) const { - return Ctx.getELFSection(".note.GNU-stack", ELF::SHT_PROGBITS, - 0, SectionKind::getMetadata()); +MCSection *MCAsmInfoELF::getNonexecutableStackSection(MCContext &Ctx) const { + return Ctx.getELFSection(".note.GNU-stack", ELF::SHT_PROGBITS, 0); } MCAsmInfoELF::MCAsmInfoELF() { |
