Merge with LLVM upstream 2011/10/20 (r142530)

Conflicts:
	lib/Support/Unix/Host.inc

Change-Id: Idc00db3b63912dca6348bddd9f8a1af2a8d5d147

7 files changed, 0 insertions, 56 deletions

diff --git a/test/LLVMC/C++/dash-x.cpp b/test/LLVMC/C++/dash-x.cpp
deleted file mode 100644
index 7d4cf19fa4..0000000000
--- a/test/LLVMC/C++/dash-x.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Test that we can compile .c files as C++ and vice versa
-// RUN: llvmc %s -x c++ %p/../test_data/false.c -x c %p/../test_data/false.cpp -x lisp -x whatnot -x none %p/../test_data/false2.cpp -o %t
-// RUN: %abs_tmp | grep hello
-// XFAIL: vg
-
-extern int test_main();
-
-int main() {
-  test_main();
-}
diff --git a/test/LLVMC/C++/dg.exp b/test/LLVMC/C++/dg.exp
deleted file mode 100644
index 209345540c..0000000000
--- a/test/LLVMC/C++/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if [ llvm_gcc_supports c++ ] then {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{unk,ll,c,cpp}]]
-}
diff --git a/test/LLVMC/C++/filelist.cpp b/test/LLVMC/C++/filelist.cpp
deleted file mode 100644
index 6f5f6f7ae8..0000000000
--- a/test/LLVMC/C++/filelist.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// Test that the -filelist option works correctly with -linker=c++.
-// RUN: llvmc --dry-run -filelist DUMMY -linker c++ |& grep llvm-g++
-// XFAIL: vg
diff --git a/test/LLVMC/C++/hello.cpp b/test/LLVMC/C++/hello.cpp
deleted file mode 100644
index 8f38306e9e..0000000000
--- a/test/LLVMC/C++/hello.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// Test that we can compile C++ code.
-// RUN: llvmc %s -o %t
-// RUN: %abs_tmp | grep hello
-// XFAIL: vg
-#include <iostream>
-
-int main() {
-    std::cout << "hello" << '\n';
-}
diff --git a/test/LLVMC/C++/just-compile.cpp b/test/LLVMC/C++/just-compile.cpp
deleted file mode 100644
index 771c9822da..0000000000
--- a/test/LLVMC/C++/just-compile.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Test that the -c flag works.
-// RUN: llvmc -c %s -o %t.o
-// RUN: llvmc --linker=c++ %t.o -o %t
-// RUN: %abs_tmp | grep hello
-// XFAIL: vg
-#include <iostream>
-
-int main() {
-    std::cout << "hello" << '\n';
-}
diff --git a/test/LLVMC/C++/together.cpp b/test/LLVMC/C++/together.cpp
deleted file mode 100644
index 925215a4db..0000000000
--- a/test/LLVMC/C++/together.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Check that we can compile files of different types together.
-// RUN: llvmc %s %p/../test_data/together.c -o %t
-// RUN: %abs_tmp | grep hello
-// XFAIL: vg
-
-extern "C" void test();
-
-int main() {
-  test();
-}
diff --git a/test/LLVMC/C++/unknown_suffix.unk b/test/LLVMC/C++/unknown_suffix.unk
deleted file mode 100644
index bf4aea2862..0000000000
--- a/test/LLVMC/C++/unknown_suffix.unk
+++ /dev/null
@@ -1,9 +0,0 @@
-// Test that the -x option works for files with unknown suffixes.
-// RUN: llvmc -x c++ %s -o %t
-// RUN: %abs_tmp | grep hello
-// XFAIL: vg
-#include <iostream>
-
-int main() {
-    std::cout << "hello" << '\n';
-}