aboutsummaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile9
-rw-r--r--utils/TableGen/CodeGenTarget.cpp6
-rw-r--r--utils/TableGen/EDEmitter.cpp1
3 files changed, 16 insertions, 0 deletions
diff --git a/utils/Makefile b/utils/Makefile
index 7a3c17d032..f972b6596f 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -11,6 +11,15 @@ LEVEL = ..
PARALLEL_DIRS := FileCheck FileUpdate TableGen PerfectShuffle \
count fpcmp llvm-lit not unittest yaml2obj
+ifeq ($(NACL_SANDBOX),1)
+ # In sandboxed mode, just build the bare minimum
+ # Note: TableGen is usually built twice:
+ # * once with host compiler
+ # * also with the "given" compiler
+ # Here we just disable that second build
+ PARALLEL_DIRS :=
+endif
+
EXTRA_DIST := check-each-file codegen-diff countloc.sh \
DSAclean.py DSAextract.py emacs findsym.pl GenLibDeps.pl \
getsrcs.sh llvmdo llvmgrep llvm-native-gcc \
diff --git a/utils/TableGen/CodeGenTarget.cpp b/utils/TableGen/CodeGenTarget.cpp
index 3a3b0aa380..42c7a59702 100644
--- a/utils/TableGen/CodeGenTarget.cpp
+++ b/utils/TableGen/CodeGenTarget.cpp
@@ -309,6 +309,12 @@ void CodeGenTarget::ComputeInstrsByEnum() const {
"BUNDLE",
"LIFETIME_START",
"LIFETIME_END",
+ // @LOCALMOD-BEGIN
+ "BUNDLE_ALIGN_START",
+ "BUNDLE_ALIGN_END",
+ "BUNDLE_LOCK",
+ "BUNDLE_UNLOCK",
+ // @LOCALMOD-END
0
};
const DenseMap<const Record*, CodeGenInstruction*> &Insts = getInstructions();
diff --git a/utils/TableGen/EDEmitter.cpp b/utils/TableGen/EDEmitter.cpp
index b687df7f67..2b3c20a2ce 100644
--- a/utils/TableGen/EDEmitter.cpp
+++ b/utils/TableGen/EDEmitter.cpp
@@ -272,6 +272,7 @@ static int X86TypeFromOpName(LiteralConstantEmitter *type,
REG("RFP32");
REG("GR64");
REG("GR64_NOAX");
+ REG("GR32_TC_64"); // @LOCALMOD
REG("GR64_TC");
REG("FR64");
REG("VR64");