diff options
| author | Petar Jovanovic <petar.jovanovic@rt-rk.com> | 2013-10-30 13:16:42 +0100 |
|---|---|---|
| committer | Petar Jovanovic <petar.jovanovic@rt-rk.com> | 2013-10-30 13:16:42 +0100 |
| commit | 64ad0b18dc627d913a301088e7e517f28ec05d3f (patch) | |
| tree | 7f3a558d18070c48128f527db0263489ccfb2e7c /lib/Target/Mips | |
| parent | a6df9e3ab2ab7b43a6097edec19990b25ccf15b7 (diff) | |
Move global FlagSfi variables to common module
When built as nexe, llc is configured and built for one arch only.
Variables FlagSfiData, FlagSfiLoad, FlagSfiStore, FlagSfiStack, and
FlagSfiBranch have to availabe for MIPS as well, so this change moves
them from ARM-only code to common code.
BUG= building pnacl-llc.nexe for MIPS fails
TEST= build sandboxed tools for MIPS
R=mseaborn@chromium.org
Review URL: https://codereview.chromium.org/46193002
Diffstat (limited to 'lib/Target/Mips')
| -rw-r--r-- | lib/Target/Mips/MipsNaClHeaders.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/Mips/MipsNaClRewritePass.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/Mips/MipsNaClRewritePass.h | 21 |
3 files changed, 2 insertions, 23 deletions
diff --git a/lib/Target/Mips/MipsNaClHeaders.cpp b/lib/Target/Mips/MipsNaClHeaders.cpp index 375c287d67..ac4ffc2803 100644 --- a/lib/Target/Mips/MipsNaClHeaders.cpp +++ b/lib/Target/Mips/MipsNaClHeaders.cpp @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// +#include "llvm/MC/MCNaCl.h" #include "llvm/Support/raw_ostream.h" -#include "MipsNaClRewritePass.h" #include <string> using namespace llvm; diff --git a/lib/Target/Mips/MipsNaClRewritePass.cpp b/lib/Target/Mips/MipsNaClRewritePass.cpp index 6ab95109e9..c6b94041df 100644 --- a/lib/Target/Mips/MipsNaClRewritePass.cpp +++ b/lib/Target/Mips/MipsNaClRewritePass.cpp @@ -24,10 +24,10 @@ #define DEBUG_TYPE "mips-sfi" #include "Mips.h" #include "MipsInstrInfo.h" -#include "MipsNaClRewritePass.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineJumpTableInfo.h" +#include "llvm/MC/MCNaCl.h" #include "llvm/IR/Function.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" diff --git a/lib/Target/Mips/MipsNaClRewritePass.h b/lib/Target/Mips/MipsNaClRewritePass.h deleted file mode 100644 index 4e729ec985..0000000000 --- a/lib/Target/Mips/MipsNaClRewritePass.h +++ /dev/null @@ -1,21 +0,0 @@ -//===-- MipsNaClRewritePass.h - NaCl Sandboxing Pass ---------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -//===----------------------------------------------------------------------===// - -#ifndef TARGET_MIPSNACLREWRITEPASS_H -#define TARGET_MIPSNACLREWRITEPASS_H - -#include "llvm/Target/TargetRegisterInfo.h" -#include "llvm/CodeGen/MachineInstr.h" -#include "llvm/Support/CommandLine.h" - -namespace llvm { - extern cl::opt<bool> FlagSfiLoad; - extern cl::opt<bool> FlagSfiStore; - extern cl::opt<bool> FlagSfiStack; - extern cl::opt<bool> FlagSfiBranch; -} - -#endif |