From 7b61ddfa6e62bf1b26cc1ca3a8ecc62e23b082ef Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 15 Oct 2014 16:12:52 +0000 Subject: Simplify handling of --noexecstack by using getNonexecutableStackSection. llvm-svn: 219799 --- llvm/tools/llvm-mc/Disassembler.cpp | 2 +- llvm/tools/llvm-mc/llvm-mc.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'llvm/tools/llvm-mc') diff --git a/llvm/tools/llvm-mc/Disassembler.cpp b/llvm/tools/llvm-mc/Disassembler.cpp index 93675903987..0ff73c5dd0f 100644 --- a/llvm/tools/llvm-mc/Disassembler.cpp +++ b/llvm/tools/llvm-mc/Disassembler.cpp @@ -185,7 +185,7 @@ int Disassembler::disassemble(const Target &T, } // Set up initial section manually here - Streamer.InitSections(); + Streamer.InitSections(false); bool ErrorOccurred = false; diff --git a/llvm/tools/llvm-mc/llvm-mc.cpp b/llvm/tools/llvm-mc/llvm-mc.cpp index 61d1d9960d0..5da9e866235 100644 --- a/llvm/tools/llvm-mc/llvm-mc.cpp +++ b/llvm/tools/llvm-mc/llvm-mc.cpp @@ -471,9 +471,10 @@ int main(int argc, char **argv) { assert(FileType == OFT_ObjectFile && "Invalid file type!"); MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, *STI, Ctx); MCAsmBackend *MAB = TheTarget->createMCAsmBackend(*MRI, TripleName, MCPU); - Str.reset(TheTarget->createMCObjectStreamer(TripleName, Ctx, *MAB, - FOS, CE, *STI, RelaxAll, - NoExecStack)); + Str.reset(TheTarget->createMCObjectStreamer(TripleName, Ctx, *MAB, FOS, CE, + *STI, RelaxAll)); + if (NoExecStack) + Str->InitSections(true); } int Res = 1; -- cgit v1.2.3