Index: local/include/llvm/System/Assert.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ local/include/llvm/System/Assert.h	2010-06-11 11:22:52.000000000 -0700
@@ -0,0 +1,22 @@
+//===-- llvm/System/Assert.h - Assertions -----------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the assert() macro.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_SUPPORT_ASSERT_H
+#define LLVM_SUPPORT_ASSERT_H
+
+extern "C" int (*LLVMDie)(const char *Message, const char *File, int Line);
+
+#define assert(e)   ((void)((e) ? 0 : LLVMDie(#e, __FILE__, __LINE__)))
+
+#endif
+
Index: local/include/llvm/Support/Casting.h
===================================================================
--- local.orig/include/llvm/Support/Casting.h	2010-06-10 17:35:56.000000000 -0700
+++ local/include/llvm/Support/Casting.h	2010-06-10 17:36:46.000000000 -0700
@@ -15,7 +15,7 @@
 #ifndef LLVM_SUPPORT_CASTING_H
 #define LLVM_SUPPORT_CASTING_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/lib/System/Assert.cpp
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ local/lib/System/Assert.cpp	2010-06-10 17:36:46.000000000 -0700
@@ -0,0 +1,27 @@
+//===-- llvm/System/Assert.cpp - Assertions -------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides the default implementation of the LLVMDie() function.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/System/Assert.h"
+#include <cstdio>
+#include <cstdlib>
+
+static int LLVMDefaultDie(const char *Message, const char *File, int Line) {
+  fprintf(stderr, "Assertion failed: %s, file %s, line %d.", Message, File,
+          Line);
+  abort();
+  return 1;
+}
+
+int (*LLVMDie)(const char *Message, const char *File, int Line) =
+    LLVMDefaultDie;
+
Index: local/include/llvm-c/Core.h
===================================================================
--- local.orig/include/llvm-c/Core.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm-c/Core.h	2010-06-11 15:16:21.000000000 -0700
@@ -280,6 +280,8 @@
 
 void LLVMDisposeMessage(char *Message);
 
+extern int (*LLVMDie)(const char *Message, const char *File, int Line);
+
 
 /*===-- Contexts ----------------------------------------------------------===*/
 
Index: local/include/llvm/ADT/APInt.h
===================================================================
--- local.orig/include/llvm/ADT/APInt.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/APInt.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 #define LLVM_APINT_H
 
 #include "llvm/Support/MathExtras.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <climits>
 #include <cstring>
 #include <string>
Index: local/include/llvm/ADT/BitVector.h
===================================================================
--- local.orig/include/llvm/ADT/BitVector.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/BitVector.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 
 #include "llvm/Support/MathExtras.h"
 #include <algorithm>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <climits>
 #include <cstring>
 
Index: local/include/llvm/ADT/DenseMap.h
===================================================================
--- local.orig/include/llvm/ADT/DenseMap.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/DenseMap.h	2010-06-11 15:16:21.000000000 -0700
@@ -21,7 +21,7 @@
 #include <iterator>
 #include <new>
 #include <utility>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstring>
 
 namespace llvm {
Index: local/include/llvm/ADT/EquivalenceClasses.h
===================================================================
--- local.orig/include/llvm/ADT/EquivalenceClasses.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/EquivalenceClasses.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 #define LLVM_ADT_EQUIVALENCECLASSES_H
 
 #include "llvm/System/DataTypes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <set>
 
 namespace llvm {
Index: local/include/llvm/ADT/ImmutableList.h
===================================================================
--- local.orig/include/llvm/ADT/ImmutableList.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/ImmutableList.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 #include "llvm/Support/Allocator.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/System/DataTypes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/ADT/ImmutableSet.h
===================================================================
--- local.orig/include/llvm/ADT/ImmutableSet.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/ImmutableSet.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 #include "llvm/Support/Allocator.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/System/DataTypes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <functional>
 
 namespace llvm {
Index: local/include/llvm/ADT/IndexedMap.h
===================================================================
--- local.orig/include/llvm/ADT/IndexedMap.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/IndexedMap.h	2010-06-11 15:16:21.000000000 -0700
@@ -20,7 +20,7 @@
 #ifndef LLVM_ADT_INDEXEDMAP_H
 #define LLVM_ADT_INDEXEDMAP_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <functional>
 #include <vector>
 
Index: local/include/llvm/ADT/IntrusiveRefCntPtr.h
===================================================================
--- local.orig/include/llvm/ADT/IntrusiveRefCntPtr.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/IntrusiveRefCntPtr.h	2010-06-11 15:16:21.000000000 -0700
@@ -21,7 +21,7 @@
 #ifndef LLVM_ADT_INTRUSIVE_REF_CNT_PTR
 #define LLVM_ADT_INTRUSIVE_REF_CNT_PTR
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 #include "llvm/Support/Casting.h"
 
Index: local/include/llvm/ADT/Optional.h
===================================================================
--- local.orig/include/llvm/ADT/Optional.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/Optional.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 #ifndef LLVM_ADT_OPTIONAL
 #define LLVM_ADT_OPTIONAL
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/ADT/OwningPtr.h
===================================================================
--- local.orig/include/llvm/ADT/OwningPtr.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/OwningPtr.h	2010-06-11 15:16:21.000000000 -0700
@@ -14,7 +14,7 @@
 #ifndef LLVM_ADT_OWNING_PTR_H
 #define LLVM_ADT_OWNING_PTR_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstddef>
 
 namespace llvm {
Index: local/include/llvm/ADT/PointerIntPair.h
===================================================================
--- local.orig/include/llvm/ADT/PointerIntPair.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/PointerIntPair.h	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #define LLVM_ADT_POINTERINTPAIR_H
 
 #include "llvm/Support/PointerLikeTypeTraits.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/ADT/ScopedHashTable.h
===================================================================
--- local.orig/include/llvm/ADT/ScopedHashTable.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/ScopedHashTable.h	2010-06-11 15:16:21.000000000 -0700
@@ -31,7 +31,7 @@
 #ifndef LLVM_ADT_SCOPEDHASHTABLE_H
 #define LLVM_ADT_SCOPEDHASHTABLE_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include "llvm/ADT/DenseMap.h"
 
 namespace llvm {
Index: local/include/llvm/ADT/SetVector.h
===================================================================
--- local.orig/include/llvm/ADT/SetVector.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/SetVector.h	2010-06-11 15:16:21.000000000 -0700
@@ -22,7 +22,7 @@
 
 #include "llvm/ADT/SmallSet.h"
 #include <algorithm>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <vector>
 
 namespace llvm {
Index: local/include/llvm/ADT/SmallBitVector.h
===================================================================
--- local.orig/include/llvm/ADT/SmallBitVector.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/SmallBitVector.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 
 #include "llvm/ADT/BitVector.h"
 #include "llvm/Support/MathExtras.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/ADT/SmallPtrSet.h
===================================================================
--- local.orig/include/llvm/ADT/SmallPtrSet.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/SmallPtrSet.h	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #ifndef LLVM_ADT_SMALLPTRSET_H
 #define LLVM_ADT_SMALLPTRSET_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstring>
 #include <iterator>
 #include "llvm/System/DataTypes.h"
Index: local/include/llvm/ADT/SmallVector.h
===================================================================
--- local.orig/include/llvm/ADT/SmallVector.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/SmallVector.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 
 #include "llvm/Support/type_traits.h"
 #include <algorithm>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstdlib>
 #include <cstring>
 #include <memory>
Index: local/include/llvm/ADT/SparseBitVector.h
===================================================================
--- local.orig/include/llvm/ADT/SparseBitVector.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/SparseBitVector.h	2010-06-11 15:16:21.000000000 -0700
@@ -20,7 +20,7 @@
 #include "llvm/System/DataTypes.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/raw_ostream.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <climits>
 #include <cstring>
 
Index: local/include/llvm/ADT/StringRef.h
===================================================================
--- local.orig/include/llvm/ADT/StringRef.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/StringRef.h	2010-06-11 15:16:21.000000000 -0700
@@ -10,7 +10,7 @@
 #ifndef LLVM_ADT_STRINGREF_H
 #define LLVM_ADT_STRINGREF_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstring>
 #include <utility>
 #include <string>
Index: local/include/llvm/ADT/StringSet.h
===================================================================
--- local.orig/include/llvm/ADT/StringSet.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/StringSet.h	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #define LLVM_ADT_STRINGSET_H
 
 #include "llvm/ADT/StringMap.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/ADT/StringSwitch.h
===================================================================
--- local.orig/include/llvm/ADT/StringSwitch.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/StringSwitch.h	2010-06-11 15:16:21.000000000 -0700
@@ -14,7 +14,7 @@
 #define LLVM_ADT_STRINGSWITCH_H
 
 #include "llvm/ADT/StringRef.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstring>
 
 namespace llvm {
Index: local/include/llvm/ADT/Trie.h
===================================================================
--- local.orig/include/llvm/ADT/Trie.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/Trie.h	2010-06-11 15:16:21.000000000 -0700
@@ -18,7 +18,7 @@
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/Support/DOTGraphTraits.h"
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <vector>
 
 namespace llvm {
Index: local/include/llvm/ADT/Twine.h
===================================================================
--- local.orig/include/llvm/ADT/Twine.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/Twine.h	2010-06-11 15:16:21.000000000 -0700
@@ -12,7 +12,7 @@
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/System/DataTypes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <string>
 
 namespace llvm {
Index: local/include/llvm/ADT/UniqueVector.h
===================================================================
--- local.orig/include/llvm/ADT/UniqueVector.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/UniqueVector.h	2010-06-11 15:16:21.000000000 -0700
@@ -10,7 +10,7 @@
 #ifndef LLVM_ADT_UNIQUEVECTOR_H
 #define LLVM_ADT_UNIQUEVECTOR_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <map>
 #include <vector>
 
Index: local/include/llvm/ADT/ilist.h
===================================================================
--- local.orig/include/llvm/ADT/ilist.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/ADT/ilist.h	2010-06-11 15:16:21.000000000 -0700
@@ -38,7 +38,7 @@
 #ifndef LLVM_ADT_ILIST_H
 #define LLVM_ADT_ILIST_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <iterator>
 
 namespace llvm {
Index: local/include/llvm/AbstractTypeUser.h
===================================================================
--- local.orig/include/llvm/AbstractTypeUser.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/AbstractTypeUser.h	2010-06-11 15:16:21.000000000 -0700
@@ -25,9 +25,9 @@
 // llvm/AbstractTypeUser.h
 //
 // In this way, most every LLVM source file will have access to the assert()
-// macro without having to #include <cassert> directly.
+// macro without having to #include "llvm/System/Assert.h" directly.
 //
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/Analysis/InlineCost.h
===================================================================
--- local.orig/include/llvm/Analysis/InlineCost.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Analysis/InlineCost.h	2010-06-11 15:16:21.000000000 -0700
@@ -14,7 +14,7 @@
 #ifndef LLVM_ANALYSIS_INLINECOST_H
 #define LLVM_ANALYSIS_INLINECOST_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <climits>
 #include <vector>
 #include "llvm/ADT/DenseMap.h"
Index: local/include/llvm/Analysis/ProfileInfo.h
===================================================================
--- local.orig/include/llvm/Analysis/ProfileInfo.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Analysis/ProfileInfo.h	2010-06-11 15:16:21.000000000 -0700
@@ -24,7 +24,7 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/raw_ostream.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <string>
 #include <map>
 #include <set>
Index: local/include/llvm/Analysis/Trace.h
===================================================================
--- local.orig/include/llvm/Analysis/Trace.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Analysis/Trace.h	2010-06-11 15:16:21.000000000 -0700
@@ -19,7 +19,7 @@
 #define LLVM_ANALYSIS_TRACE_H
 
 #include <vector>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
   class BasicBlock;
Index: local/include/llvm/Attributes.h
===================================================================
--- local.orig/include/llvm/Attributes.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Attributes.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 #define LLVM_ATTRIBUTES_H
 
 #include "llvm/Support/MathExtras.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <string>
 
 namespace llvm {
Index: local/include/llvm/Bitcode/BitCodes.h
===================================================================
--- local.orig/include/llvm/Bitcode/BitCodes.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Bitcode/BitCodes.h	2010-06-11 15:16:21.000000000 -0700
@@ -20,7 +20,7 @@
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/System/DataTypes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 namespace bitc {
Index: local/include/llvm/CodeGen/LiveInterval.h
===================================================================
--- local.orig/include/llvm/CodeGen/LiveInterval.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/CodeGen/LiveInterval.h	2010-06-11 15:16:21.000000000 -0700
@@ -25,7 +25,7 @@
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/AlignOf.h"
 #include "llvm/CodeGen/SlotIndexes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <climits>
 
 namespace llvm {
Index: local/include/llvm/CodeGen/MachineConstantPool.h
===================================================================
--- local.orig/include/llvm/CodeGen/MachineConstantPool.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/CodeGen/MachineConstantPool.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 #ifndef LLVM_CODEGEN_MACHINECONSTANTPOOL_H
 #define LLVM_CODEGEN_MACHINECONSTANTPOOL_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <climits>
 #include <vector>
 
Index: local/include/llvm/CodeGen/MachineFrameInfo.h
===================================================================
--- local.orig/include/llvm/CodeGen/MachineFrameInfo.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/CodeGen/MachineFrameInfo.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/System/DataTypes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <vector>
 
 namespace llvm {
Index: local/include/llvm/CodeGen/MachineJumpTableInfo.h
===================================================================
--- local.orig/include/llvm/CodeGen/MachineJumpTableInfo.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/CodeGen/MachineJumpTableInfo.h	2010-06-11 15:16:21.000000000 -0700
@@ -21,7 +21,7 @@
 #define LLVM_CODEGEN_MACHINEJUMPTABLEINFO_H
 
 #include <vector>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/CodeGen/MachineOperand.h
===================================================================
--- local.orig/include/llvm/CodeGen/MachineOperand.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/CodeGen/MachineOperand.h	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #define LLVM_CODEGEN_MACHINEOPERAND_H
 
 #include "llvm/System/DataTypes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
   
Index: local/include/llvm/CodeGen/MachineRelocation.h
===================================================================
--- local.orig/include/llvm/CodeGen/MachineRelocation.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/CodeGen/MachineRelocation.h	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #define LLVM_CODEGEN_MACHINERELOCATION_H
 
 #include "llvm/System/DataTypes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 class GlobalValue;
Index: local/include/llvm/CodeGen/SelectionDAG.h
===================================================================
--- local.orig/include/llvm/CodeGen/SelectionDAG.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/CodeGen/SelectionDAG.h	2010-06-11 15:16:21.000000000 -0700
@@ -21,7 +21,7 @@
 #include "llvm/CodeGen/SelectionDAGNodes.h"
 #include "llvm/Support/RecyclingAllocator.h"
 #include "llvm/Target/TargetMachine.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <vector>
 #include <map>
 #include <string>
Index: local/include/llvm/CodeGen/SelectionDAGNodes.h
===================================================================
--- local.orig/include/llvm/CodeGen/SelectionDAGNodes.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/CodeGen/SelectionDAGNodes.h	2010-06-11 15:16:21.000000000 -0700
@@ -31,7 +31,7 @@
 #include "llvm/Support/MathExtras.h"
 #include "llvm/System/DataTypes.h"
 #include "llvm/Support/DebugLoc.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/CodeGen/ValueTypes.h
===================================================================
--- local.orig/include/llvm/CodeGen/ValueTypes.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/CodeGen/ValueTypes.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 #ifndef LLVM_CODEGEN_VALUETYPES_H
 #define LLVM_CODEGEN_VALUETYPES_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <string>
 #include "llvm/System/DataTypes.h"
 #include "llvm/Support/MathExtras.h"
Index: local/include/llvm/CompilerDriver/CompilationGraph.h
===================================================================
--- local.orig/include/llvm/CompilerDriver/CompilationGraph.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/CompilerDriver/CompilationGraph.h	2010-06-11 15:16:21.000000000 -0700
@@ -23,7 +23,7 @@
 #include "llvm/ADT/StringSet.h"
 #include "llvm/System/Path.h"
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <string>
 
 namespace llvmc {
Index: local/include/llvm/MC/MCAsmInfo.h
===================================================================
--- local.orig/include/llvm/MC/MCAsmInfo.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/MC/MCAsmInfo.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 #define LLVM_TARGET_ASM_INFO_H
 
 #include "llvm/MC/MCDirectives.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
   class MCSection;
Index: local/include/llvm/MC/MCCodeEmitter.h
===================================================================
--- local.orig/include/llvm/MC/MCCodeEmitter.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/MC/MCCodeEmitter.h	2010-06-11 15:16:21.000000000 -0700
@@ -12,7 +12,7 @@
 
 #include "llvm/MC/MCFixup.h"
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 class MCExpr;
Index: local/include/llvm/MC/MCFixup.h
===================================================================
--- local.orig/include/llvm/MC/MCFixup.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/MC/MCFixup.h	2010-06-11 15:16:21.000000000 -0700
@@ -11,7 +11,7 @@
 #define LLVM_MC_MCFIXUP_H
 
 #include "llvm/System/DataTypes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 class MCExpr;
Index: local/include/llvm/MC/MCObjectWriter.h
===================================================================
--- local.orig/include/llvm/MC/MCObjectWriter.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/MC/MCObjectWriter.h	2010-06-11 15:16:21.000000000 -0700
@@ -12,7 +12,7 @@
 
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/System/DataTypes.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 class MCAsmLayout;
Index: local/include/llvm/MC/MCParser/AsmLexer.h
===================================================================
--- local.orig/include/llvm/MC/MCParser/AsmLexer.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/MC/MCParser/AsmLexer.h	2010-06-11 15:16:21.000000000 -0700
@@ -19,7 +19,7 @@
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/System/DataTypes.h"
 #include <string>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 class MemoryBuffer;
Index: local/include/llvm/MC/MCValue.h
===================================================================
--- local.orig/include/llvm/MC/MCValue.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/MC/MCValue.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 
 #include "llvm/System/DataTypes.h"
 #include "llvm/MC/MCSymbol.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 class MCAsmInfo;
Index: local/include/llvm/MC/MachObjectWriter.h
===================================================================
--- local.orig/include/llvm/MC/MachObjectWriter.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/MC/MachObjectWriter.h	2010-06-11 15:16:21.000000000 -0700
@@ -12,7 +12,7 @@
 
 #include "llvm/MC/MCObjectWriter.h"
 #include "llvm/Support/raw_ostream.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 class MCAssembler;
Index: local/include/llvm/Pass.h
===================================================================
--- local.orig/include/llvm/Pass.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Pass.h	2010-06-11 15:16:21.000000000 -0700
@@ -31,7 +31,7 @@
 
 #include "llvm/System/DataTypes.h"
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <string>
 #include <utility>
 #include <vector>
Index: local/include/llvm/Support/Allocator.h
===================================================================
--- local.orig/include/llvm/Support/Allocator.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Support/Allocator.h	2010-06-11 15:16:21.000000000 -0700
@@ -18,7 +18,7 @@
 #include "llvm/Support/MathExtras.h"
 #include "llvm/System/DataTypes.h"
 #include <algorithm>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstdlib>
 #include <cstddef>
 
Index: local/include/llvm/Support/CommandLine.h
===================================================================
--- local.orig/include/llvm/Support/CommandLine.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Support/CommandLine.h	2010-06-11 15:16:21.000000000 -0700
@@ -24,7 +24,7 @@
 #include "llvm/Support/Compiler.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Twine.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <climits>
 #include <cstdarg>
 #include <utility>
Index: local/include/llvm/Support/Format.h
===================================================================
--- local.orig/include/llvm/Support/Format.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Support/Format.h	2010-06-11 15:16:21.000000000 -0700
@@ -23,7 +23,7 @@
 #ifndef LLVM_SUPPORT_FORMAT_H
 #define LLVM_SUPPORT_FORMAT_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstdio>
 #ifdef _MSC_VER
 // FIXME: This define is wrong:
Index: local/include/llvm/Support/GraphWriter.h
===================================================================
--- local.orig/include/llvm/Support/GraphWriter.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Support/GraphWriter.h	2010-06-11 15:16:21.000000000 -0700
@@ -28,7 +28,7 @@
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/System/Path.h"
 #include <vector>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/Support/OutputBuffer.h
===================================================================
--- local.orig/include/llvm/Support/OutputBuffer.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Support/OutputBuffer.h	2010-06-11 15:16:21.000000000 -0700
@@ -14,7 +14,7 @@
 #ifndef LLVM_SUPPORT_OUTPUTBUFFER_H
 #define LLVM_SUPPORT_OUTPUTBUFFER_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <string>
 #include <vector>
 
Index: local/include/llvm/Support/Recycler.h
===================================================================
--- local.orig/include/llvm/Support/Recycler.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Support/Recycler.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 
 #include "llvm/ADT/ilist.h"
 #include "llvm/Support/AlignOf.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/Support/SlowOperationInformer.h
===================================================================
--- local.orig/include/llvm/Support/SlowOperationInformer.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Support/SlowOperationInformer.h	2010-06-11 15:16:21.000000000 -0700
@@ -30,7 +30,7 @@
 #define LLVM_SUPPORT_SLOW_OPERATION_INFORMER_H
 
 #include <string>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include "llvm/System/DataTypes.h"
 
 namespace llvm {
Index: local/include/llvm/Support/SourceMgr.h
===================================================================
--- local.orig/include/llvm/Support/SourceMgr.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Support/SourceMgr.h	2010-06-11 15:16:21.000000000 -0700
@@ -20,7 +20,7 @@
 
 #include <string>
 #include <vector>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
   class MemoryBuffer;
Index: local/include/llvm/Support/StringPool.h
===================================================================
--- local.orig/include/llvm/Support/StringPool.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Support/StringPool.h	2010-06-11 15:16:21.000000000 -0700
@@ -31,7 +31,7 @@
 
 #include "llvm/ADT/StringMap.h"
 #include <new>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/include/llvm/Support/Timer.h
===================================================================
--- local.orig/include/llvm/Support/Timer.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Support/Timer.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 
 #include "llvm/System/DataTypes.h"
 #include "llvm/ADT/StringRef.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <string>
 #include <vector>
 #include <utility>
Index: local/include/llvm/System/Mutex.h
===================================================================
--- local.orig/include/llvm/System/Mutex.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/System/Mutex.h	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #define LLVM_SYSTEM_MUTEX_H
 
 #include "llvm/System/Threading.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm
 {
Index: local/include/llvm/System/RWMutex.h
===================================================================
--- local.orig/include/llvm/System/RWMutex.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/System/RWMutex.h	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #define LLVM_SYSTEM_RWMUTEX_H
 
 #include "llvm/System/Threading.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm
 {
Index: local/include/llvm/System/ThreadLocal.h
===================================================================
--- local.orig/include/llvm/System/ThreadLocal.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/System/ThreadLocal.h	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #define LLVM_SYSTEM_THREAD_LOCAL_H
 
 #include "llvm/System/Threading.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
   namespace sys {
Index: local/include/llvm/Target/TargetJITInfo.h
===================================================================
--- local.orig/include/llvm/Target/TargetJITInfo.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Target/TargetJITInfo.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 #ifndef LLVM_TARGET_TARGETJITINFO_H
 #define LLVM_TARGET_TARGETJITINFO_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/System/DataTypes.h"
 
Index: local/include/llvm/Target/TargetMachine.h
===================================================================
--- local.orig/include/llvm/Target/TargetMachine.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Target/TargetMachine.h	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #define LLVM_TARGET_TARGETMACHINE_H
 
 #include "llvm/Target/TargetInstrItineraries.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <string>
 
 namespace llvm {
Index: local/include/llvm/Target/TargetRegisterInfo.h
===================================================================
--- local.orig/include/llvm/Target/TargetRegisterInfo.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Target/TargetRegisterInfo.h	2010-06-11 15:16:21.000000000 -0700
@@ -19,7 +19,7 @@
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/ADT/DenseSet.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <functional>
 
 namespace llvm {
Index: local/include/llvm/Target/TargetRegistry.h
===================================================================
--- local.orig/include/llvm/Target/TargetRegistry.h	2010-06-11 15:15:35.000000000 -0700
+++ local/include/llvm/Target/TargetRegistry.h	2010-06-11 15:16:21.000000000 -0700
@@ -21,7 +21,7 @@
 
 #include "llvm/ADT/Triple.h"
 #include <string>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
   class AsmPrinter;
Index: local/lib/CodeGen/PBQP/Math.h
===================================================================
--- local.orig/lib/CodeGen/PBQP/Math.h	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/CodeGen/PBQP/Math.h	2010-06-11 15:16:21.000000000 -0700
@@ -10,7 +10,7 @@
 #ifndef LLVM_CODEGEN_PBQP_MATH_H 
 #define LLVM_CODEGEN_PBQP_MATH_H
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <algorithm>
 #include <functional>
 
Index: local/lib/ExecutionEngine/JIT/JITMemoryManager.cpp
===================================================================
--- local.orig/lib/ExecutionEngine/JIT/JITMemoryManager.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/ExecutionEngine/JIT/JITMemoryManager.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -24,7 +24,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/System/Memory.h"
 #include <vector>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <climits>
 #include <cstring>
 using namespace llvm;
Index: local/lib/Support/DAGDeltaAlgorithm.cpp
===================================================================
--- local.orig/lib/Support/DAGDeltaAlgorithm.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Support/DAGDeltaAlgorithm.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -37,7 +37,7 @@
 #include "llvm/Support/Format.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <iterator>
 #include <map>
 using namespace llvm;
Index: local/lib/Support/ErrorHandling.cpp
===================================================================
--- local.orig/lib/Support/ErrorHandling.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Support/ErrorHandling.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -18,7 +18,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/System/Signals.h"
 #include "llvm/System/Threading.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstdlib>
 using namespace llvm;
 using namespace std;
Index: local/lib/Support/FoldingSet.cpp
===================================================================
--- local.orig/lib/Support/FoldingSet.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Support/FoldingSet.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -18,7 +18,7 @@
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MathExtras.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstring>
 using namespace llvm;
 
Index: local/lib/Support/ManagedStatic.cpp
===================================================================
--- local.orig/lib/Support/ManagedStatic.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Support/ManagedStatic.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -14,7 +14,7 @@
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Config/config.h"
 #include "llvm/System/Atomic.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 using namespace llvm;
 
 static const ManagedStaticBase *StaticList = 0;
Index: local/lib/Support/MemoryBuffer.cpp
===================================================================
--- local.orig/lib/Support/MemoryBuffer.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Support/MemoryBuffer.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -18,7 +18,7 @@
 #include "llvm/System/Path.h"
 #include "llvm/System/Process.h"
 #include "llvm/System/Program.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstdio>
 #include <cstring>
 #include <cerrno>
Index: local/lib/Support/SlowOperationInformer.cpp
===================================================================
--- local.orig/lib/Support/SlowOperationInformer.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Support/SlowOperationInformer.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/System/Alarm.h"
 #include <sstream>
-#include <cassert>
+#include "llvm/System/Assert.h"
 using namespace llvm;
 
 SlowOperationInformer::SlowOperationInformer(const std::string &Name)
Index: local/lib/Support/StringMap.cpp
===================================================================
--- local.orig/lib/Support/StringMap.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Support/StringMap.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -13,7 +13,7 @@
 
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringExtras.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 using namespace llvm;
 
 StringMapImpl::StringMapImpl(unsigned InitSize, unsigned itemSize) {
Index: local/lib/Support/TargetRegistry.cpp
===================================================================
--- local.orig/lib/Support/TargetRegistry.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Support/TargetRegistry.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -9,7 +9,7 @@
 
 #include "llvm/Target/TargetRegistry.h"
 #include "llvm/System/Host.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 using namespace llvm;
 
 // Clients are responsible for avoid race conditions in registration.
Index: local/lib/Support/Triple.cpp
===================================================================
--- local.orig/lib/Support/Triple.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Support/Triple.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -11,7 +11,7 @@
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/Twine.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstring>
 using namespace llvm;
 
Index: local/lib/System/Disassembler.cpp
===================================================================
--- local.orig/lib/System/Disassembler.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/System/Disassembler.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #include "llvm/Config/config.h"
 #include "llvm/System/Disassembler.h"
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <iomanip>
 #include <string>
 #include <sstream>
Index: local/lib/System/Mutex.cpp
===================================================================
--- local.orig/lib/System/Mutex.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/System/Mutex.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -33,7 +33,7 @@
 
 #if defined(HAVE_PTHREAD_H) && defined(HAVE_PTHREAD_MUTEX_LOCK)
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <pthread.h>
 #include <stdlib.h>
 
Index: local/lib/System/Path.cpp
===================================================================
--- local.orig/lib/System/Path.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/System/Path.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -13,7 +13,7 @@
 
 #include "llvm/System/Path.h"
 #include "llvm/Config/config.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstring>
 #include <ostream>
 using namespace llvm;
Index: local/lib/System/RWMutex.cpp
===================================================================
--- local.orig/lib/System/RWMutex.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/System/RWMutex.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -35,7 +35,7 @@
 
 #if defined(HAVE_PTHREAD_H) && defined(HAVE_PTHREAD_RWLOCK_INIT)
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <pthread.h>
 #include <stdlib.h>
 
Index: local/lib/System/ThreadLocal.cpp
===================================================================
--- local.orig/lib/System/ThreadLocal.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/System/ThreadLocal.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -32,7 +32,7 @@
 
 #if defined(HAVE_PTHREAD_H) && defined(HAVE_PTHREAD_GETSPECIFIC)
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <pthread.h>
 #include <stdlib.h>
 
Index: local/lib/System/Threading.cpp
===================================================================
--- local.orig/lib/System/Threading.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/System/Threading.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -15,7 +15,7 @@
 #include "llvm/System/Atomic.h"
 #include "llvm/System/Mutex.h"
 #include "llvm/Config/config.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 using namespace llvm;
 
Index: local/lib/System/Unix/Alarm.inc
===================================================================
--- local.orig/lib/System/Unix/Alarm.inc	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/System/Unix/Alarm.inc	2010-06-11 15:16:21.000000000 -0700
@@ -13,7 +13,7 @@
 
 #include <signal.h>
 #include <unistd.h>
-#include <cassert>
+#include "llvm/System/Assert.h"
 using namespace llvm;
 
 /// AlarmCancelled - This flag is set by the SIGINT signal handler if the
Index: local/lib/System/Win32/Alarm.inc
===================================================================
--- local.orig/lib/System/Win32/Alarm.inc	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/System/Win32/Alarm.inc	2010-06-11 15:16:21.000000000 -0700
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <cassert>
+#include "llvm/System/Assert.h"
 using namespace llvm;
 
 /// NestedSOI - Sanity check.  Alarms cannot be nested or run in parallel.
Index: local/lib/System/Win32/Win32.h
===================================================================
--- local.orig/lib/System/Win32/Win32.h	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/System/Win32/Win32.h	2010-06-11 15:16:21.000000000 -0700
@@ -21,7 +21,7 @@
 
 #include "llvm/Config/config.h"     // Get autoconf configuration settings
 #include "windows.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <string>
 
 inline bool MakeErrMsg(std::string* ErrMsg, const std::string& prefix) {
Index: local/lib/Target/ARM/ARM.h
===================================================================
--- local.orig/lib/Target/ARM/ARM.h	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Target/ARM/ARM.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Target/TargetMachine.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/lib/Target/ARM/ARMAddressingModes.h
===================================================================
--- local.orig/lib/Target/ARM/ARMAddressingModes.h	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Target/ARM/ARMAddressingModes.h	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 
 #include "llvm/CodeGen/SelectionDAGNodes.h"
 #include "llvm/Support/MathExtras.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 
Index: local/lib/Target/PIC16/PIC16.h
===================================================================
--- local.orig/lib/Target/PIC16/PIC16.h	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Target/PIC16/PIC16.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Target/TargetMachine.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <sstream>
 #include <cstring>
 #include <string>
Index: local/lib/Target/PIC16/PIC16ABINames.h
===================================================================
--- local.orig/lib/Target/PIC16/PIC16ABINames.h	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Target/PIC16/PIC16ABINames.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Target/TargetMachine.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <sstream>
 #include <cstring>
 #include <string>
Index: local/lib/Target/PowerPC/PPCPredicates.cpp
===================================================================
--- local.orig/lib/Target/PowerPC/PPCPredicates.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Target/PowerPC/PPCPredicates.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -13,7 +13,7 @@
 
 #include "PPCPredicates.h"
 #include "llvm/Support/ErrorHandling.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 using namespace llvm;
 
 PPC::Predicate PPC::InvertPredicate(PPC::Predicate Opcode) {
Index: local/lib/Target/Sparc/Sparc.h
===================================================================
--- local.orig/lib/Target/Sparc/Sparc.h	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Target/Sparc/Sparc.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Target/TargetMachine.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
   class FunctionPass;
Index: local/lib/Target/SubtargetFeature.cpp
===================================================================
--- local.orig/lib/Target/SubtargetFeature.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/Target/SubtargetFeature.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/ADT/StringExtras.h"
 #include <algorithm>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cctype>
 using namespace llvm;
 
Index: local/lib/VMCore/Core.cpp
===================================================================
--- local.orig/lib/VMCore/Core.cpp	2010-06-11 15:15:35.000000000 -0700
+++ local/lib/VMCore/Core.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -27,7 +27,7 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstdlib>
 #include <cstring>
 
Index: local/utils/PerfectShuffle/Makefile
===================================================================
--- local.orig/utils/PerfectShuffle/Makefile	2010-06-11 15:15:36.000000000 -0700
+++ local/utils/PerfectShuffle/Makefile	2010-06-11 15:16:21.000000000 -0700
@@ -9,6 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = llvm-PerfectShuffle
+USEDLIBS = LLVMSystem.a
 NO_INSTALL = 1
 
 # This tool has no plugins, optimize startup time.
Index: local/utils/PerfectShuffle/PerfectShuffle.cpp
===================================================================
--- local.orig/utils/PerfectShuffle/PerfectShuffle.cpp	2010-06-11 15:15:36.000000000 -0700
+++ local/utils/PerfectShuffle/PerfectShuffle.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -16,7 +16,7 @@
 
 #include <iostream>
 #include <vector>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <cstdlib>
 struct Operator;
 
Index: local/utils/TableGen/AsmMatcherEmitter.h
===================================================================
--- local.orig/utils/TableGen/AsmMatcherEmitter.h	2010-06-11 15:15:36.000000000 -0700
+++ local/utils/TableGen/AsmMatcherEmitter.h	2010-06-11 15:16:21.000000000 -0700
@@ -18,7 +18,7 @@
 #include "TableGenBackend.h"
 #include <map>
 #include <vector>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
   class AsmMatcherEmitter : public TableGenBackend {
Index: local/utils/TableGen/AsmWriterEmitter.h
===================================================================
--- local.orig/utils/TableGen/AsmWriterEmitter.h	2010-06-11 15:15:36.000000000 -0700
+++ local/utils/TableGen/AsmWriterEmitter.h	2010-06-11 15:16:21.000000000 -0700
@@ -18,7 +18,7 @@
 #include "TableGenBackend.h"
 #include <map>
 #include <vector>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
   class AsmWriterInst;
Index: local/utils/TableGen/CallingConvEmitter.h
===================================================================
--- local.orig/utils/TableGen/CallingConvEmitter.h	2010-06-11 15:15:36.000000000 -0700
+++ local/utils/TableGen/CallingConvEmitter.h	2010-06-11 15:16:21.000000000 -0700
@@ -18,7 +18,7 @@
 #include "TableGenBackend.h"
 #include <map>
 #include <vector>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
   class CallingConvEmitter : public TableGenBackend {
Index: local/utils/TableGen/LLVMCConfigurationEmitter.cpp
===================================================================
--- local.orig/utils/TableGen/LLVMCConfigurationEmitter.cpp	2010-06-11 15:15:36.000000000 -0700
+++ local/utils/TableGen/LLVMCConfigurationEmitter.cpp	2010-06-11 15:16:21.000000000 -0700
@@ -19,7 +19,7 @@
 #include "llvm/ADT/StringSet.h"
 
 #include <algorithm>
-#include <cassert>
+#include "llvm/System/Assert.h"
 #include <functional>
 #include <stdexcept>
 #include <string>
Index: local/utils/TableGen/TGLexer.h
===================================================================
--- local.orig/utils/TableGen/TGLexer.h	2010-06-11 15:15:36.000000000 -0700
+++ local/utils/TableGen/TGLexer.h	2010-06-11 15:16:21.000000000 -0700
@@ -17,7 +17,7 @@
 #include "llvm/System/DataTypes.h"
 #include <vector>
 #include <string>
-#include <cassert>
+#include "llvm/System/Assert.h"
 
 namespace llvm {
 class MemoryBuffer;
