Merge remote-tracking branch 'pnacl/master' into merge_37
diff --git a/emscripten-version.txt b/emscripten-version.txt
new file mode 100644
index 0000000..08666e2
--- /dev/null
+++ b/emscripten-version.txt
@@ -0,0 +1,2 @@
+1.34.6
+
diff --git a/test/CodeGen/emscripten-arguments.c b/test/CodeGen/emscripten-arguments.c
index b90164b..1c3271e 100644
--- a/test/CodeGen/emscripten-arguments.c
+++ b/test/CodeGen/emscripten-arguments.c
@@ -77,3 +77,4 @@
// Bitfields should be passed as byval structs.
// CHECK: define void @f10(%struct.bitfield1* byval align 4 %bf1)
void f10(bitfield1 bf1) {}
+
diff --git a/test/CodeGen/emscripten-regparm.c b/test/CodeGen/emscripten-regparm.c
index 14c3ae5..20ffc9d 100644
--- a/test/CodeGen/emscripten-regparm.c
+++ b/test/CodeGen/emscripten-regparm.c
@@ -1,3 +1,4 @@
// RUN: %clang_cc1 -triple asmjs-unknown-emscripten %s -fsyntax-only -verify
void __attribute__((regparm(2))) fc_f1(int i, int j, int k) {} // expected-error{{'regparm' is not valid on this platform}}
+
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index e592aca..b9bba64 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -9,6 +9,7 @@
Instrumentation
MC
MCParser
+ NaClTransforms
ObjCARCOpts
Option
ScalarOpts
diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index 347702e..41be0d7 100644
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -31,9 +31,9 @@
TOOL_NO_EXPORTS := 1
endif
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
+LINK_COMPONENTS := nacltransforms $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
instrumentation ipo irreader linker objcarcopts option \
- profiledata selectiondag
+ profiledata selectiondag nacltransforms
USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \
clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \
clangRewriteFrontend.a clangRewrite.a
