diff options
Diffstat (limited to 'include/llvm')
91 files changed, 206 insertions, 201 deletions
diff --git a/include/llvm/ADT/BitSetVector.h b/include/llvm/ADT/BitSetVector.h index 276af0a68a..73c5841ad6 100644 --- a/include/llvm/ADT/BitSetVector.h +++ b/include/llvm/ADT/BitSetVector.h @@ -1,4 +1,4 @@ -//===-- BitVectorSet.h - A bit-vector representation of sets ----*- C++ -*-===// +//===-- llvm/ADT/BitVectorSet.h - A bit-vector rep. of sets -----*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -22,8 +22,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_BITSETVECTOR_H -#define SUPPORT_BITSETVECTOR_H +#ifndef LLVM_ADT_BITSETVECTOR_H +#define LLVM_ADT_BITSETVECTOR_H #include <bitset> #include <vector> diff --git a/include/llvm/ADT/DenseMap.h b/include/llvm/ADT/DenseMap.h index 4f6dc91bb6..c141a6c6f4 100644 --- a/include/llvm/ADT/DenseMap.h +++ b/include/llvm/ADT/DenseMap.h @@ -1,4 +1,4 @@ -//===- DenseMap.h - A dense map implmentation -------------------*- C++ -*-===// +//===- llvm/ADT/DenseMap.h - A dense map implmentation ----------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -17,8 +17,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_DENSEMAP_H -#define SUPPORT_DENSEMAP_H +#ifndef LLVM_ADT_DENSEMAP_H +#define LLVM_ADT_DENSEMAP_H #include <vector> diff --git a/include/llvm/ADT/DepthFirstIterator.h b/include/llvm/ADT/DepthFirstIterator.h index c465f4e549..d18ca9d582 100644 --- a/include/llvm/ADT/DepthFirstIterator.h +++ b/include/llvm/ADT/DepthFirstIterator.h @@ -1,4 +1,4 @@ -//===- Support/DepthFirstIterator.h - Depth First iterator ------*- C++ -*-===// +//===- llvm/ADT/DepthFirstIterator.h - Depth First iterator -----*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// // -// This file builds on the Support/GraphTraits.h file to build generic depth +// This file builds on the ADT/GraphTraits.h file to build generic depth // first graph iterator. This file exposes the following functions/types: // // df_begin/df_end/df_iterator @@ -30,11 +30,11 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_DEPTHFIRSTITERATOR_H -#define SUPPORT_DEPTHFIRSTITERATOR_H +#ifndef LLVM_ADT_DEPTHFIRSTITERATOR_H +#define LLVM_ADT_DEPTHFIRSTITERATOR_H -#include "Support/GraphTraits.h" -#include "Support/iterator" +#include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/iterator" #include <vector> #include <set> diff --git a/include/llvm/ADT/EquivalenceClasses.h b/include/llvm/ADT/EquivalenceClasses.h index 127183614b..cb4b8bcc32 100644 --- a/include/llvm/ADT/EquivalenceClasses.h +++ b/include/llvm/ADT/EquivalenceClasses.h @@ -1,4 +1,4 @@ -//===-- Support/EquivalenceClasses.h ----------------------------*- C++ -*-===// +//===-- llvm/ADT/EquivalenceClasses.h - Generic Equiv. Classes --*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -14,8 +14,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_EQUIVALENCECLASSES_H -#define SUPPORT_EQUIVALENCECLASSES_H +#ifndef LLVM_ADT_EQUIVALENCECLASSES_H +#define LLVM_ADT_EQUIVALENCECLASSES_H #include <map> #include <set> diff --git a/include/llvm/ADT/GraphTraits.h b/include/llvm/ADT/GraphTraits.h index 4ff74176a7..e5765bb713 100644 --- a/include/llvm/ADT/GraphTraits.h +++ b/include/llvm/ADT/GraphTraits.h @@ -1,4 +1,4 @@ -//===-- Support/GraphTraits.h - Graph traits template -----------*- C++ -*-===// +//===-- llvm/ADT/GraphTraits.h - Graph traits template ----------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -15,8 +15,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_GRAPHTRAITS_H -#define SUPPORT_GRAPHTRAITS_H +#ifndef LLVM_ADT_GRAPHTRAITS_H +#define LLVM_ADT_GRAPHTRAITS_H namespace llvm { diff --git a/include/llvm/ADT/HashExtras.h b/include/llvm/ADT/HashExtras.h index 67f65b5f3a..f82115a07c 100644 --- a/include/llvm/ADT/HashExtras.h +++ b/include/llvm/ADT/HashExtras.h @@ -1,4 +1,4 @@ -//===-- HashExtras.h - Useful functions for STL hash containers -*- C++ -*-===// +//===-- llvm/ADT/HashExtras.h - Useful functions for STL hash ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -14,10 +14,10 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_HASHEXTRAS_H -#define SUPPORT_HASHEXTRAS_H +#ifndef LLVM_ADT_HASHEXTRAS_H +#define LLVM_ADT_HASHEXTRAS_H -#include "Support/hash_map" +#include "llvm/ADT/hash_map" #include <string> // Cannot specialize hash template from outside of the std namespace. diff --git a/include/llvm/ADT/IndexedMap.h b/include/llvm/ADT/IndexedMap.h index 4f6dc91bb6..c141a6c6f4 100644 --- a/include/llvm/ADT/IndexedMap.h +++ b/include/llvm/ADT/IndexedMap.h @@ -1,4 +1,4 @@ -//===- DenseMap.h - A dense map implmentation -------------------*- C++ -*-===// +//===- llvm/ADT/DenseMap.h - A dense map implmentation ----------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -17,8 +17,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_DENSEMAP_H -#define SUPPORT_DENSEMAP_H +#ifndef LLVM_ADT_DENSEMAP_H +#define LLVM_ADT_DENSEMAP_H #include <vector> diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h index d66c4b84c4..8ae46768b5 100644 --- a/include/llvm/ADT/PostOrderIterator.h +++ b/include/llvm/ADT/PostOrderIterator.h @@ -1,4 +1,4 @@ -//===- Support/PostOrderIterator.h - Generic PostOrder iterator -*- C++ -*-===// +//===- llvm/ADT/PostOrderIterator.h - PostOrder iterator --------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,17 +7,17 @@ // //===----------------------------------------------------------------------===// // -// This file builds on the Support/GraphTraits.h file to build a generic graph +// This file builds on the ADT/GraphTraits.h file to build a generic graph // post order iterator. This should work over any graph type that has a // GraphTraits specialization. // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_POSTORDERITERATOR_H -#define SUPPORT_POSTORDERITERATOR_H +#ifndef LLVM_ADT_POSTORDERITERATOR_H +#define LLVM_ADT_POSTORDERITERATOR_H -#include "Support/GraphTraits.h" -#include "Support/iterator" +#include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/iterator" #include <stack> #include <set> diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h index 2ea780ca92..9cccd12324 100644 --- a/include/llvm/ADT/SCCIterator.h +++ b/include/llvm/ADT/SCCIterator.h @@ -1,4 +1,4 @@ -//===-- Support/SCCIterator.h - SCC iterator --------------------*- C++ -*-===// +//===-- Support/SCCIterator.h - Strongly Connected Comp. Iter. --*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// // -// This builds on the Support/GraphTraits.h file to find the strongly connected +// This builds on the llvm/ADT/GraphTraits.h file to find the strongly connected // components (SCCs) of a graph in O(N+E) time using Tarjan's DFS algorithm. // // The SCC iterator has the important property that if a node in SCC S1 has an @@ -18,11 +18,11 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_SCCITERATOR_H -#define SUPPORT_SCCITERATOR_H +#ifndef LLVM_ADT_SCCITERATOR_H +#define LLVM_ADT_SCCITERATOR_H -#include "Support/GraphTraits.h" -#include "Support/iterator" +#include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/iterator" #include <vector> #include <map> diff --git a/include/llvm/ADT/STLExtras.h b/include/llvm/ADT/STLExtras.h index b6379d2623..14b61bc916 100644 --- a/include/llvm/ADT/STLExtras.h +++ b/include/llvm/ADT/STLExtras.h @@ -1,4 +1,4 @@ -//===- STLExtras.h - Useful functions when working with the STL -*- C++ -*-===// +//===- llvm/ADT/STLExtras.h - Useful STL related functions ------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -14,12 +14,12 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_STLEXTRAS_H -#define SUPPORT_STLEXTRAS_H +#ifndef LLVM_ADT_STLEXTRAS_H +#define LLVM_ADT_STLEXTRAS_H #include <functional> #include <utility> // for std::pair -#include "Support/iterator" +#include "llvm/ADT/iterator" namespace llvm { diff --git a/include/llvm/ADT/SetOperations.h b/include/llvm/ADT/SetOperations.h index bb1e68e6b2..3be8babc38 100644 --- a/include/llvm/ADT/SetOperations.h +++ b/include/llvm/ADT/SetOperations.h @@ -1,4 +1,4 @@ -//===-- Support/SetOperations.h - Generic Set Operations --------*- C++ -*-===// +//===-- llvm/ADT/SetOperations.h - Generic Set Operations -------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_SETOPERATIONS_H -#define SUPPORT_SETOPERATIONS_H +#ifndef LLVM_ADT_SETOPERATIONS_H +#define LLVM_ADT_SETOPERATIONS_H namespace llvm { diff --git a/include/llvm/ADT/SetVector.h b/include/llvm/ADT/SetVector.h index c72f49bce8..6135e53286 100644 --- a/include/llvm/ADT/SetVector.h +++ b/include/llvm/ADT/SetVector.h @@ -1,4 +1,4 @@ -//===- SetVector.h - A set with insertion order iteration -------*- C++ -*-===// +//===- llvm/ADT/SetVector.h - Set with insert order iteration ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -14,8 +14,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_SETVECTOR_H -#define SUPPORT_SETVECTOR_H +#ifndef LLVM_ADT_SETVECTOR_H +#define LLVM_ADT_SETVECTOR_H #include <set> #include <vector> diff --git a/include/llvm/ADT/Statistic.h b/include/llvm/ADT/Statistic.h index 79d8f9d66e..31e9ae110d 100644 --- a/include/llvm/ADT/Statistic.h +++ b/include/llvm/ADT/Statistic.h @@ -1,4 +1,4 @@ -//===-- Support/Statistic.h - Easy way to expose stats ----------*- C++ -*-===// +//===-- llvm/ADT/Statistic.h - Easy way to expose stats ---------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -21,8 +21,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_STATISTIC_H -#define SUPPORT_STATISTIC_H +#ifndef LLVM_ADT_STATISTIC_H +#define LLVM_ADT_STATISTIC_H #include <iostream> diff --git a/include/llvm/ADT/StringExtras.h b/include/llvm/ADT/StringExtras.h index fcfa65f232..7e25f654d8 100644 --- a/include/llvm/ADT/StringExtras.h +++ b/include/llvm/ADT/StringExtras.h @@ -1,4 +1,4 @@ -//===-- Support/StringExtras.h - Useful string functions --------*- C++ -*-===// +//===-- llvm/ADT/StringExtras.h - Useful string functions -------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -11,10 +11,10 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_STRINGEXTRAS_H -#define SUPPORT_STRINGEXTRAS_H +#ifndef LLVM_ADT_STRINGEXTRAS_H +#define LLVM_ADT_STRINGEXTRAS_H -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include <cctype> #include <cstdio> #include <string> diff --git a/include/llvm/ADT/Tree.h b/include/llvm/ADT/Tree.h index 48ecf5b06d..3193eecba2 100644 --- a/include/llvm/ADT/Tree.h +++ b/include/llvm/ADT/Tree.h @@ -1,4 +1,4 @@ -//===- Support/Tree.h - Generic n-way tree structure ------------*- C++ -*-===// +//===- llvm/ADT/Tree.h - Generic n-way tree structure -----------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_TREE_H -#define SUPPORT_TREE_H +#ifndef LLVM_ADT_TREE_H +#define LLVM_ADT_TREE_H #include <vector> diff --git a/include/llvm/ADT/VectorExtras.h b/include/llvm/ADT/VectorExtras.h index cf7cf5d2eb..adc3ff720d 100644 --- a/include/llvm/ADT/VectorExtras.h +++ b/include/llvm/ADT/VectorExtras.h @@ -1,4 +1,4 @@ -//===-- VectorExtras.h - Helper functions for std::vector -------*- C++ -*-===// +//===-- llvm/ADT/VectorExtras.h - Helpers for std::vector -------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_VECTOREXTRAS_H -#define SUPPORT_VECTOREXTRAS_H +#ifndef LLVM_ADT_VECTOREXTRAS_H +#define LLVM_ADT_VECTOREXTRAS_H #include <cstdarg> diff --git a/include/llvm/ADT/hash_map.in b/include/llvm/ADT/hash_map.in index 0253de788f..9f09ef2ba1 100644 --- a/include/llvm/ADT/hash_map.in +++ b/include/llvm/ADT/hash_map.in @@ -1,4 +1,4 @@ -//===-- Support/hash_map - "Portable" wrapper around hash_map ---*- C++ -*-===// +//===-- llvm/ADT/hash_map - "Portable" wrapper around hash_map --*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -14,8 +14,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_HASH_MAP -#define SUPPORT_HASH_MAP +#ifndef LLVM_ADT_HASH_MAP +#define LLVM_ADT_HASH_MAP // Compiler Support Matrix // @@ -61,6 +61,6 @@ using HASH_NAMESPACE::hash; // out specializations like stl_bvector.h, causing link conflicts. #include <vector> -#include <Support/HashExtras.h> +#include <llvm/ADT/HashExtras.h> #endif diff --git a/include/llvm/ADT/hash_set.in b/include/llvm/ADT/hash_set.in index 49c5d732e8..6da8c7f6a3 100644 --- a/include/llvm/ADT/hash_set.in +++ b/include/llvm/ADT/hash_set.in @@ -1,4 +1,4 @@ -//===-- Support/hash_set - "Portable" wrapper around hash_set ---*- C++ -*-===// +//===-- llvm/ADT/hash_set - "Portable" wrapper around hash_set --*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -15,8 +15,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_HASH_SET -#define SUPPORT_HASH_SET +#ifndef LLVM_ADT_HASH_SET +#define LLVM_ADT_HASH_SET // Compiler Support Matrix // @@ -62,6 +62,6 @@ using HASH_NAMESPACE::hash; // out specializations like stl_bvector.h, causing link conflicts. #include <vector> -#include <Support/HashExtras.h> +#include <llvm/ADT/HashExtras.h> #endif diff --git a/include/llvm/ADT/ilist b/include/llvm/ADT/ilist index 9d9fdf0fdb..8c447c92e9 100644 --- a/include/llvm/ADT/ilist +++ b/include/llvm/ADT/ilist @@ -1,4 +1,4 @@ -//===-- Support/ilist - Intrusive Linked List Template ----------*- C++ -*-===// +//===-- llvm/ADT/ilist - Intrusive Linked List Template ---------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -35,10 +35,10 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_ILIST -#define SUPPORT_ILIST +#ifndef LLVM_ADT_ILIST +#define LLVM_ADT_ILIST -#include <Support/iterator> +#include <llvm/ADT/iterator> #include <cassert> namespace llvm { diff --git a/include/llvm/ADT/iterator.in b/include/llvm/ADT/iterator.in index 93813e1985..072beb71ee 100644 --- a/include/llvm/ADT/iterator.in +++ b/include/llvm/ADT/iterator.in @@ -1,4 +1,4 @@ -//===-- Support/iterator - "Portable" wrapper around <iterator> -*- C++ -*-===// +//===-- llvm/ADT/iterator - Portable wrapper around <iterator> --*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -25,8 +25,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_ITERATOR -#define SUPPORT_ITERATOR +#ifndef LLVM_ADT_ITERATOR +#define LLVM_ADT_ITERATOR #include <iterator> diff --git a/include/llvm/Analysis/AliasSetTracker.h b/include/llvm/Analysis/AliasSetTracker.h index 544b2b945d..ddcbbb0ad5 100644 --- a/include/llvm/Analysis/AliasSetTracker.h +++ b/include/llvm/Analysis/AliasSetTracker.h @@ -18,9 +18,9 @@ #define LLVM_ANALYSIS_ALIASSETTRACKER_H #include "llvm/Support/CallSite.h" -#include "Support/iterator" -#include "Support/hash_map" -#include "Support/ilist" +#include "llvm/ADT/iterator" +#include "llvm/ADT/hash_map" +#include "llvm/ADT/ilist" namespace llvm { diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h index 86a2b53ad4..2a1f49c83c 100644 --- a/include/llvm/Analysis/CallGraph.h +++ b/include/llvm/Analysis/CallGraph.h @@ -51,8 +51,8 @@ #ifndef LLVM_ANALYSIS_CALLGRAPH_H #define LLVM_ANALYSIS_CALLGRAPH_H -#include "Support/GraphTraits.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/Pass.h" namespace llvm { diff --git a/include/llvm/Analysis/ConstantsScanner.h b/include/llvm/Analysis/ConstantsScanner.h index e1533c35bb..48c0bd0875 100644 --- a/include/llvm/Analysis/ConstantsScanner.h +++ b/include/llvm/Analysis/ConstantsScanner.h @@ -18,7 +18,7 @@ #include "llvm/Support/InstIterator.h" #include "llvm/Instruction.h" -#include "Support/iterator" +#include "llvm/ADT/iterator" namespace llvm { diff --git a/include/llvm/Analysis/DataStructure/DSGraphTraits.h b/include/llvm/Analysis/DataStructure/DSGraphTraits.h index 608cd198ef..efb31517d1 100644 --- a/include/llvm/Analysis/DataStructure/DSGraphTraits.h +++ b/include/llvm/Analysis/DataStructure/DSGraphTraits.h @@ -17,9 +17,9 @@ #define LLVM_ANALYSIS_DSGRAPHTRAITS_H #include "llvm/Analysis/DataStructure/DSGraph.h" -#include "Support/GraphTraits.h" -#include "Support/iterator" -#include "Support/STLExtras.h" +#include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/iterator" +#include "llvm/ADT/STLExtras.h" namespace llvm { diff --git a/include/llvm/Analysis/DataStructure/DSSupport.h b/include/llvm/Analysis/DataStructure/DSSupport.h index 8cce6c98fd..e5bf390472 100644 --- a/include/llvm/Analysis/DataStructure/DSSupport.h +++ b/include/llvm/Analysis/DataStructure/DSSupport.h @@ -15,7 +15,7 @@ #define LLVM_ANALYSIS_DSSUPPORT_H #include <functional> -#include "Support/hash_set" +#include "llvm/ADT/hash_set" #include "llvm/Support/CallSite.h" namespace llvm { diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h index f210003213..9351ed4c98 100644 --- a/include/llvm/Analysis/DataStructure/DataStructure.h +++ b/include/llvm/Analysis/DataStructure/DataStructure.h @@ -16,7 +16,7 @@ #include "llvm/Pass.h" #include "llvm/Target/TargetData.h" -#include "Support/hash_set" +#include "llvm/ADT/hash_set" namespace llvm { diff --git a/include/llvm/Analysis/Interval.h b/include/llvm/Analysis/Interval.h index 0d5912305b..448bcbc803 100644 --- a/include/llvm/Analysis/Interval.h +++ b/include/llvm/Analysis/Interval.h @@ -20,7 +20,7 @@ #ifndef LLVM_INTERVAL_H #define LLVM_INTERVAL_H -#include "Support/GraphTraits.h" +#include "llvm/ADT/GraphTraits.h" #include <vector> #include <iosfwd> diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h index 38f9264923..c5eec83428 100644 --- a/include/llvm/Analysis/LoopInfo.h +++ b/include/llvm/Analysis/LoopInfo.h @@ -31,7 +31,7 @@ #define LLVM_ANALYSIS_LOOP_INFO_H #include "llvm/Pass.h" -#include "Support/GraphTraits.h" +#include "llvm/ADT/GraphTraits.h" namespace llvm { diff --git a/include/llvm/BasicBlock.h b/include/llvm/BasicBlock.h index 27acba4c62..9c82da266e 100644 --- a/include/llvm/BasicBlock.h +++ b/include/llvm/BasicBlock.h @@ -30,7 +30,7 @@ #include "llvm/Instruction.h" #include "llvm/SymbolTableListTraits.h" -#include "Support/ilist" +#include "llvm/ADT/ilist" namespace llvm { diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h index fb03740290..578f2b6c60 100644 --- a/include/llvm/CodeGen/MachineBasicBlock.h +++ b/include/llvm/CodeGen/MachineBasicBlock.h @@ -15,8 +15,8 @@ #define LLVM_CODEGEN_MACHINEBASICBLOCK_H #include "llvm/CodeGen/MachineInstr.h" -#include "Support/GraphTraits.h" -#include "Support/ilist" +#include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/ilist" #include <iosfwd> namespace llvm { diff --git a/include/llvm/CodeGen/MachineCodeEmitter.h b/include/llvm/CodeGen/MachineCodeEmitter.h index a46a2c5b59..0daab91faf 100644 --- a/include/llvm/CodeGen/MachineCodeEmitter.h +++ b/include/llvm/CodeGen/MachineCodeEmitter.h @@ -18,7 +18,7 @@ #define LLVM_CODEGEN_MACHINECODEEMITTER_H #include <string> -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" namespace llvm { diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h index 69b86a640e..4420c3b84e 100644 --- a/include/llvm/CodeGen/MachineFunction.h +++ b/include/llvm/CodeGen/MachineFunction.h @@ -19,7 +19,7 @@ #define LLVM_CODEGEN_MACHINEFUNCTION_H #include "llvm/CodeGen/MachineBasicBlock.h" -#include "Support/Annotation.h" +#include "llvm/Support/Annotation.h" namespace llvm { diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h index 3a01ab0fbf..a9f1352b47 100644 --- a/include/llvm/CodeGen/MachineInstr.h +++ b/include/llvm/CodeGen/MachineInstr.h @@ -16,7 +16,7 @@ #ifndef LLVM_CODEGEN_MACHINEINSTR_H #define LLVM_CODEGEN_MACHINEINSTR_H -#include "Support/iterator" +#include "llvm/ADT/iterator" #include <string> #include <vector> #include <cassert> diff --git a/include/llvm/CodeGen/SSARegMap.h b/include/llvm/CodeGen/SSARegMap.h index afed38a334..893b0c7167 100644 --- a/include/llvm/CodeGen/SSARegMap.h +++ b/include/llvm/CodeGen/SSARegMap.h @@ -18,7 +18,7 @@ #define LLVM_CODEGEN_SSAREGMAP_H #include "llvm/Target/MRegisterInfo.h" -#include "Support/DenseMap.h" +#include "llvm/ADT/DenseMap.h" namespace llvm { diff --git a/include/llvm/CodeGen/SchedGraphCommon.h b/include/llvm/CodeGen/SchedGraphCommon.h index fbb9dac751..167bfb0f2d 100644 --- a/include/llvm/CodeGen/SchedGraphCommon.h +++ b/include/llvm/CodeGen/SchedGraphCommon.h @@ -16,7 +16,7 @@ #define LLVM_CODEGEN_SCHEDGRAPHCOMMON_H #include "llvm/Value.h" -#include "Support/iterator" +#include "llvm/ADT/iterator" #include <vector> namespace llvm { diff --git a/include/llvm/CodeGen/SelectionDAG.h b/include/llvm/CodeGen/SelectionDAG.h index 4719bf9d21..796ee13535 100644 --- a/include/llvm/CodeGen/SelectionDAG.h +++ b/include/llvm/CodeGen/SelectionDAG.h @@ -23,7 +23,7 @@ #define LLVM_CODEGEN_SELECTIONDAG_H #include "llvm/CodeGen/ValueTypes.h" -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include <map> #include <vector> #include <cassert> diff --git a/include/llvm/Config/alloca.h b/include/llvm/Config/alloca.h index 297b56fa7c..d2bbec6e52 100644 --- a/include/llvm/Config/alloca.h +++ b/include/llvm/Config/alloca.h @@ -15,7 +15,7 @@ #ifndef _CONFIG_ALLOC_H #define _CONFIG_ALLOC_H -#include "Config/config.h" +#include "llvm/Config/config.h" /* * This is a modified version of that suggested by the Autoconf manual. diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index fe0c77c8af..c3046d22d0 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -1,4 +1,4 @@ -/* include/Config/config.h.in. Generated from autoconf/configure.ac by autoheader. */ +/* include/llvm/Config/config.h.in. Generated from autoconf/configure.ac by autoheader. */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. diff --git a/include/llvm/Config/dlfcn.h b/include/llvm/Config/dlfcn.h index c7ce5b1968..bf51315ce2 100644 --- a/include/llvm/Config/dlfcn.h +++ b/include/llvm/Config/dlfcn.h @@ -14,7 +14,7 @@ #ifndef _CONFIG_DLFCN_H #define _CONFIG_DLFCN_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_DLFCN_H #include <dlfcn.h> diff --git a/include/llvm/Config/fcntl.h b/include/llvm/Config/fcntl.h index ed8a1c839b..2d0d44d956 100644 --- a/include/llvm/Config/fcntl.h +++ b/include/llvm/Config/fcntl.h @@ -14,7 +14,7 @@ #ifndef _CONFIG_FCNTL_H #define _CONFIG_FCNTL_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> diff --git a/include/llvm/Config/limits.h b/include/llvm/Config/limits.h index e5a787e5e1..1182d90b57 100644 --- a/include/llvm/Config/limits.h +++ b/include/llvm/Config/limits.h @@ -14,7 +14,7 @@ #ifndef _CONFIG_LIMITS_H #define _CONFIG_LIMITS_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_LIMITS_H #include <limits.h> diff --git a/include/llvm/Config/malloc.h b/include/llvm/Config/malloc.h index c78408a359..7d16a40670 100644 --- a/include/llvm/Config/malloc.h +++ b/include/llvm/Config/malloc.h @@ -15,7 +15,7 @@ #ifndef _SUPPORT_MALLOC_H #define _SUPPORT_MALLOC_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_MALLOC_H #include <malloc.h> diff --git a/include/llvm/Config/memory.h b/include/llvm/Config/memory.h index f75902b5bc..f6fbbaf735 100644 --- a/include/llvm/Config/memory.h +++ b/include/llvm/Config/memory.h @@ -14,7 +14,7 @@ #ifndef _CONFIG_MEMORY_H #define _CONFIG_MEMORY_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_MEMORY_H #include <memory.h> diff --git a/include/llvm/Config/pagesize.h b/include/llvm/Config/pagesize.h index f37b29770d..adbf87893e 100644 --- a/include/llvm/Config/pagesize.h +++ b/include/llvm/Config/pagesize.h @@ -12,7 +12,7 @@ #ifndef PAGESIZE_H #define PAGESIZE_H -#include "Config/unistd.h" +#include "llvm/Config/unistd.h" #include <sys/param.h> namespace llvm { diff --git a/include/llvm/Config/stdint.h b/include/llvm/Config/stdint.h index a98961063e..44db789d0d 100644 --- a/include/llvm/Config/stdint.h +++ b/include/llvm/Config/stdint.h @@ -14,7 +14,7 @@ #ifndef _CONFIG_STDINT_H #define _CONFIG_STDINT_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_STDINT_H #include <stdint.h> diff --git a/include/llvm/Config/sys/mman.h b/include/llvm/Config/sys/mman.h index 7f51e7fbfb..92f394989a 100644 --- a/include/llvm/Config/sys/mman.h +++ b/include/llvm/Config/sys/mman.h @@ -18,7 +18,7 @@ #ifndef _CONFIG_MMAN_H #define _CONFIG_MMAN_H -#include "Config/config.h" +#include "llvm/Config/config.h" #if defined(HAVE_SYS_MMAN_H) && !defined(_MSC_VER) #include <sys/mman.h> diff --git a/include/llvm/Config/sys/resource.h b/include/llvm/Config/sys/resource.h index 1f4cc694b2..11cb7709ca 100644 --- a/include/llvm/Config/sys/resource.h +++ b/include/llvm/Config/sys/resource.h @@ -16,7 +16,7 @@ #ifndef _CONFIG_SYS_RESOURCE_H #define _CONFIG_SYS_RESOURCE_H -#include "Config/config.h" +#include "llvm/Config/config.h" #if defined(HAVE_SYS_RESOURCE_H) && !defined(_MSC_VER) @@ -25,9 +25,9 @@ * stuff. Some man pages say that you also need sys/time.h and unistd.h. * So, to be paranoid, we will try to include all three if possible. */ -#include "Config/sys/time.h" +#include "llvm/Config/sys/time.h" #include <sys/resource.h> -#include "Config/unistd.h" +#include "llvm/Config/unistd.h" #endif diff --git a/include/llvm/Config/sys/stat.h b/include/llvm/Config/sys/stat.h index 9669bcf927..98b7f72e0a 100644 --- a/include/llvm/Config/sys/stat.h +++ b/include/llvm/Config/sys/stat.h @@ -15,7 +15,7 @@ #ifndef _CONFIG_SYS_STAT_H #define _CONFIG_SYS_STAT_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> diff --git a/include/llvm/Config/sys/time.h b/include/llvm/Config/sys/time.h index 3e0ea1e810..f5ca3961f2 100644 --- a/include/llvm/Config/sys/time.h +++ b/include/llvm/Config/sys/time.h @@ -15,7 +15,7 @@ #ifndef _CONFIG_SYS_TIME_H #define _CONFIG_SYS_TIME_H -#include "Config/config.h" +#include "llvm/Config/config.h" #if defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) #include <sys/time.h> diff --git a/include/llvm/Config/sys/types.h b/include/llvm/Config/sys/types.h index f0a7abec35..fd6becd38f 100644 --- a/include/llvm/Config/sys/types.h +++ b/include/llvm/Config/sys/types.h @@ -15,7 +15,7 @@ #ifndef _CONFIG_SYS_TYPES_H #define _CONFIG_SYS_TYPES_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/include/llvm/Config/sys/wait.h b/include/llvm/Config/sys/wait.h index b3db60e435..a1c70fbc6c 100644 --- a/include/llvm/Config/sys/wait.h +++ b/include/llvm/Config/sys/wait.h @@ -14,7 +14,7 @@ #ifndef _CONFIG_SYS_WAIT_H #define _CONFIG_SYS_WAIT_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> diff --git a/include/llvm/Config/time.h b/include/llvm/Config/time.h index b2f3e6ee05..6d66efad1c 100644 --- a/include/llvm/Config/time.h +++ b/include/llvm/Config/time.h @@ -24,7 +24,7 @@ #ifndef _CONFIG_TIME_H #define _CONFIG_TIME_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_TIME_H #include <time.h> diff --git a/include/llvm/Config/unistd.h b/include/llvm/Config/unistd.h index 847db7a3c6..d6e90d0f9f 100644 --- a/include/llvm/Config/unistd.h +++ b/include/llvm/Config/unistd.h @@ -14,7 +14,7 @@ #ifndef _CONFIG_UNISTD_H #define _CONFIG_UNISTD_H -#include "Config/config.h" +#include "llvm/Config/config.h" #if defined(HAVE_UNISTD_H) && !defined(_MSC_VER) #include <unistd.h> diff --git a/include/llvm/Config/windows.h b/include/llvm/Config/windows.h index fded99fba8..ab443911a2 100644 --- a/include/llvm/Config/windows.h +++ b/include/llvm/Config/windows.h @@ -14,7 +14,7 @@ #ifndef LLVM_CONFIG_WINDOWS_H #define LLVM_CONFIG_WINDOWS_H -#include "Config/config.h" +#include "llvm/Config/config.h" #ifdef HAVE_WINDOWS_H #include <windows.h> diff --git a/include/llvm/Constants.h b/include/llvm/Constants.h index 5ef2cb0132..d0f577311e 100644 --- a/include/llvm/Constants.h +++ b/include/llvm/Constants.h @@ -17,7 +17,7 @@ #include "llvm/Constant.h" #include "llvm/Type.h" -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" namespace llvm { diff --git a/include/llvm/ExecutionEngine/GenericValue.h b/include/llvm/ExecutionEngine/GenericValue.h index 7cf1a7b395..6ea4366784 100644 --- a/include/llvm/ExecutionEngine/GenericValue.h +++ b/include/llvm/ExecutionEngine/GenericValue.h @@ -15,7 +15,7 @@ #ifndef GENERIC_VALUE_H #define GENERIC_VALUE_H -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" namespace llvm { diff --git a/include/llvm/Function.h b/include/llvm/Function.h index b363191b93..9e17f2602c 100644 --- a/include/llvm/Function.h +++ b/include/llvm/Function.h @@ -21,7 +21,7 @@ #include "llvm/GlobalValue.h" #include "llvm/BasicBlock.h" #include "llvm/Argument.h" -#include "Support/Annotation.h" +#include "llvm/Support/Annotation.h" namespace llvm { diff --git a/include/llvm/Support/Annotation.h b/include/llvm/Support/Annotation.h index efca20a3ec..4325836c29 100644 --- a/include/llvm/Support/Annotation.h +++ b/include/llvm/Support/Annotation.h @@ -1,4 +1,4 @@ -//===-- Support/Annotation.h - Annotation classes ---------------*- C++ -*-===// +//===-- llvm/Support/Annotation.h - Annotation classes ----------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -19,8 +19,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_ANNOTATION_H -#define SUPPORT_ANNOTATION_H +#ifndef LLVM_SUPPORT_ANNOTATION_H +#define LLVM_SUPPORT_ANNOTATION_H #include <string> #include <cassert> diff --git a/include/llvm/Support/CFG.h b/include/llvm/Support/CFG.h index a20265cd0c..badb846bac 100644 --- a/include/llvm/Support/CFG.h +++ b/include/llvm/Support/CFG.h @@ -15,10 +15,10 @@ #ifndef LLVM_SUPPORT_CFG_H #define LLVM_SUPPORT_CFG_H -#include "Support/GraphTraits.h" +#include "llvm/ADT/GraphTraits.h" #include "llvm/Function.h" #include "llvm/InstrTypes.h" -#include "Support/iterator" +#include "llvm/ADT/iterator" namespace llvm { diff --git a/include/llvm/Support/Casting.h b/include/llvm/Support/Casting.h index abc80aac7a..d189754865 100644 --- a/include/llvm/Support/Casting.h +++ b/include/llvm/Support/Casting.h @@ -1,4 +1,4 @@ -//===-- Support/Casting.h - Allow flexible, checked, casts ------*- C++ -*-===// +//===-- llvm/Support/Casting.h - Allow flexible, checked, casts -*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_CASTING_H -#define SUPPORT_CASTING_H +#ifndef LLVM_SUPPORT_CASTING_H +#define LLVM_SUPPORT_CASTING_H namespace llvm { diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h index 053b823669..2c38e0aac0 100644 --- a/include/llvm/Support/CommandLine.h +++ b/include/llvm/Support/CommandLine.h @@ -1,4 +1,4 @@ -//===- Support/CommandLine.h - Flexible Command line parser -----*- C++ -*-===// +//===- llvm/Support/CommandLine.h - Command line handler --------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -17,10 +17,10 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_COMMANDLINE_H -#define SUPPORT_COMMANDLINE_H +#ifndef LLVM_SUPPORT_COMMANDLINE_H +#define LLVM_SUPPORT_COMMANDLINE_H -#include "Support/type_traits.h" +#include "llvm/Support/type_traits.h" #include <string> #include <vector> #include <utility> diff --git a/include/llvm/Support/ConstantRange.h b/include/llvm/Support/ConstantRange.h index 30618a1692..0c8b3b6b4c 100644 --- a/include/llvm/Support/ConstantRange.h +++ b/include/llvm/Support/ConstantRange.h @@ -24,7 +24,7 @@ #ifndef LLVM_SUPPORT_CONSTANT_RANGE_H #define LLVM_SUPPORT_CONSTANT_RANGE_H -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include <iosfwd> namespace llvm { diff --git a/include/llvm/Support/DOTGraphTraits.h b/include/llvm/Support/DOTGraphTraits.h index 7dbc4ff0b6..b83b759f40 100644 --- a/include/llvm/Support/DOTGraphTraits.h +++ b/include/llvm/Support/DOTGraphTraits.h @@ -1,4 +1,4 @@ -//===-- Support/DotGraphTraits.h - Customize .dot output --------*- C++ -*-===// +//===-- llvm/Support/DotGraphTraits.h - Customize .dot output ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -14,8 +14,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_DOTGRAPHTRAITS_H -#define SUPPORT_DOTGRAPHTRAITS_H +#ifndef LLVM_SUPPORT_DOTGRAPHTRAITS_H +#define LLVM_SUPPORT_DOTGRAPHTRAITS_H #include <string> diff --git a/include/llvm/Support/Debug.h b/include/llvm/Support/Debug.h index f0a1b3dc5b..263547c980 100644 --- a/include/llvm/Support/Debug.h +++ b/include/llvm/Support/Debug.h @@ -1,4 +1,4 @@ -//===- Debug.h - An easy way to add debug output to your code ---*- C++ -*-===// +//===- llvm/Support/Debug.h - Easy way to add debug output ------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -23,8 +23,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_DEBUG_H -#define SUPPORT_DEBUG_H +#ifndef LLVM_SUPPORT_DEBUG_H +#define LLVM_SUPPORT_DEBUG_H // Unsurprisingly, most users of this macro use std::cerr too. #include <iostream> diff --git a/include/llvm/Support/DynamicLinker.h b/include/llvm/Support/DynamicLinker.h index fec9a45296..4f0bb58cab 100644 --- a/include/llvm/Support/DynamicLinker.h +++ b/include/llvm/Support/DynamicLinker.h @@ -1,4 +1,4 @@ -//===-- DynamicLinker.h - System-indep. DynamicLinker interface -*- C++ -*-===// +//===-- llvm/Support/DynamicLinker.h - Portable Dynamic Linker --*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -13,8 +13,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_DYNAMICLINKER_H -#define SUPPORT_DYNAMICLINKER_H +#ifndef LLVM_SUPPORT_DYNAMICLINKER_H +#define LLVM_SUPPORT_DYNAMICLINKER_H #include <string> diff --git a/include/llvm/Support/ELF.h b/include/llvm/Support/ELF.h index e4b87b9022..8d9f693cf6 100644 --- a/include/llvm/Support/ELF.h +++ b/include/llvm/Support/ELF.h @@ -1,4 +1,4 @@ -//===-- Support/ELF.h - ELF constants and data structures -------*- C++ -*-===// +//===-- llvm/Support/ELF.h - ELF constants and data structures --*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -18,7 +18,10 @@ // //===----------------------------------------------------------------------===// -#include "Support/DataTypes.h" +#ifndef LLVM_SUPPORT_ELF_H +#define LLVM_SUPPORT_ELF_H + +#include "llvm/Support/DataTypes.h" #include <cstring> #include <cstdlib> @@ -293,3 +296,5 @@ enum { } // end namespace ELF } // end namespace llvm + +#endif diff --git a/include/llvm/Support/FileUtilities.h b/include/llvm/Support/FileUtilities.h index 78983b8352..c9f52c3248 100644 --- a/include/llvm/Support/FileUtilities.h +++ b/include/llvm/Support/FileUtilities.h @@ -1,4 +1,4 @@ -//===- Support/FileUtilities.h - File System Utilities ----------*- C++ -*-===// +//===- llvm/Support/FileUtilities.h - File System Utilities -----*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_FILEUTILITIES_H -#define SUPPORT_FILEUTILITIES_H +#ifndef LLVM_SUPPORT_FILEUTILITIES_H +#define LLVM_SUPPORT_FILEUTILITIES_H #include <string> diff --git a/include/llvm/Support/GraphWriter.h b/include/llvm/Support/GraphWriter.h index c6a5c3cdc9..feb9900d3b 100644 --- a/include/llvm/Support/GraphWriter.h +++ b/include/llvm/Support/GraphWriter.h @@ -1,4 +1,4 @@ -//===-- Support/GraphWriter.h - Write a graph to a .dot file ----*- C++ -*-===// +//===-- llvm/Support/GraphWriter.h - Write graph to a .dot file -*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -20,11 +20,11 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_GRAPHWRITER_H -#define SUPPORT_GRAPHWRITER_H +#ifndef LLVM_SUPPORT_GRAPHWRITER_H +#define LLVM_SUPPORT_GRAPHWRITER_H -#include "Support/DOTGraphTraits.h" -#include "Support/GraphTraits.h" +#include "llvm/Support/DOTGraphTraits.h" +#include "llvm/ADT/GraphTraits.h" #include <vector> #include <iostream> diff --git a/include/llvm/Support/LeakDetector.h b/include/llvm/Support/LeakDetector.h index e2ce9c50be..6ca5405bc4 100644 --- a/include/llvm/Support/LeakDetector.h +++ b/include/llvm/Support/LeakDetector.h @@ -1,4 +1,4 @@ -//===-- Support/LeakDetector.h - Provide simple leak detection --*- C++ -*-===// +//===-- llvm/Support/LeakDetector.h - Provide leak detection ----*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -19,8 +19,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_LEAKDETECTOR_H -#define SUPPORT_LEAKDETECTOR_H +#ifndef LLVM_SUPPORT_LEAKDETECTOR_H +#define LLVM_SUPPORT_LEAKDETECTOR_H #include <string> diff --git a/include/llvm/Support/MallocAllocator.h b/include/llvm/Support/MallocAllocator.h index 3e3da4139c..c17517e2a0 100644 --- a/include/llvm/Support/MallocAllocator.h +++ b/include/llvm/Support/MallocAllocator.h @@ -1,4 +1,4 @@ -//===-- Support/MallocAllocator.h - Allocator using malloc/free -*- C++ -*-===// +//===-- llvm/Support/MallocAllocator.h --------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -17,8 +17,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_MALLOCALLOCATOR_H -#define SUPPORT_MALLOCALLOCATOR_H +#ifndef LLVM_SUPPORT_MALLOCALLOCATOR_H +#define LLVM_SUPPORT_MALLOCALLOCATOR_H #include <cstdlib> #include <memory> diff --git a/include/llvm/Support/Mangler.h b/include/llvm/Support/Mangler.h index 4043d85a71..14d68b59d3 100644 --- a/include/llvm/Support/Mangler.h +++ b/include/llvm/Support/Mangler.h @@ -1,4 +1,4 @@ -//===-- Mangler.h - Self-contained llvm name mangler ------------*- C++ -*-===// +//===-- llvm/Support/Mangler.h - Self-contained name mangler ----*- C++ -*-===// // // The LLVM Compiler Infrastructure // diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h index c1384d3eff..bfc175f2c1 100644 --- a/include/llvm/Support/MathExtras.h +++ b/include/llvm/Support/MathExtras.h @@ -1,4 +1,4 @@ -//===-- Support/MathExtras.h - Useful math functions ------------*- C++ -*-===// +//===-- llvm/Support/MathExtras.h - Useful math functions -------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -11,10 +11,10 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_MATHEXTRAS_H -#define SUPPORT_MATHEXTRAS_H +#ifndef LLVM_SUPPORT_MATHEXTRAS_H +#define LLVM_SUPPORT_MATHEXTRAS_H -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" namespace llvm { diff --git a/include/llvm/Support/MutexGuard.h b/include/llvm/Support/MutexGuard.h index 470010219f..48428b8cde 100644 --- a/include/llvm/Support/MutexGuard.h +++ b/include/llvm/Support/MutexGuard.h @@ -18,9 +18,9 @@ #define SUPPORT_THREADSUPPORT_H #if @HAVE_PTHREAD_MUTEX_LOCK@ -#include "Support/ThreadSupport-PThreads.h" +#include "llvm/Support/ThreadSupport-PThreads.h" #else -#include "Support/ThreadSupport-NoSupport.h" +#include "llvm/Support/ThreadSupport-NoSupport.h" #endif // If no system support is available namespace llvm { diff --git a/include/llvm/Support/PassNameParser.h b/include/llvm/Support/PassNameParser.h index 0ffcabad52..71ebe41a45 100644 --- a/include/llvm/Support/PassNameParser.h +++ b/include/llvm/Support/PassNameParser.h @@ -23,7 +23,7 @@ #ifndef LLVM_SUPPORT_PASS_NAME_PARSER_H #define LLVM_SUPPORT_PASS_NAME_PARSER_H -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/Pass.h" #include <algorithm> #include <iostream> diff --git a/include/llvm/Support/PluginLoader.h b/include/llvm/Support/PluginLoader.h index 7410895c3a..48f8a7d8dc 100644 --- a/include/llvm/Support/PluginLoader.h +++ b/include/llvm/Support/PluginLoader.h @@ -1,4 +1,4 @@ -//===-- Support/PluginLoader.h - Provide -load option to tool ---*- C++ -*-===// +//===-- llvm/Support/PluginLoader.h - Plugin Loader for Tools ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -14,10 +14,10 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_PLUGINLOADER_H -#define SUPPORT_PLUGINLOADER_H +#ifndef LLVM_SUPPORT_PLUGINLOADER_H +#define LLVM_SUPPORT_PLUGINLOADER_H -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" namespace llvm { struct PluginLoader { diff --git a/include/llvm/Support/SlowOperationInformer.h b/include/llvm/Support/SlowOperationInformer.h index 67edf7df42..896fd3fb06 100644 --- a/include/llvm/Support/SlowOperationInformer.h +++ b/include/llvm/Support/SlowOperationInformer.h @@ -1,4 +1,4 @@ -//===- SlowOperationInformer.h - Keep the user informed ---------*- C++ -*-===// +//===- llvm/Support/SlowOperationInformer.h - Keep user informed *- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -28,8 +28,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_SLOW_OPERATION_INFORMER_H -#define SUPPORT_SLOW_OPERATION_INFORMER_H +#ifndef LLVM_SUPPORT_SLOW_OPERATION_INFORMER_H +#define LLVM_SUPPORT_SLOW_OPERATION_INFORMER_H #include <string> #include <cassert> diff --git a/include/llvm/Support/SystemUtils.h b/include/llvm/Support/SystemUtils.h index b8c130cc97..aea7df80eb 100644 --- a/include/llvm/Support/SystemUtils.h +++ b/include/llvm/Support/SystemUtils.h @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SYSTEMUTILS_H -#define SYSTEMUTILS_H +#ifndef LLVM_SUPPORT_SYSTEMUTILS_H +#define LLVM_SUPPORT_SYSTEMUTILS_H #include <string> diff --git a/include/llvm/Support/ThreadSupport-NoSupport.h b/include/llvm/Support/ThreadSupport-NoSupport.h index 5dc954efab..3602e21cea 100644 --- a/include/llvm/Support/ThreadSupport-NoSupport.h +++ b/include/llvm/Support/ThreadSupport-NoSupport.h @@ -1,4 +1,4 @@ -//===-- Support/ThreadSupport-NoSupport.h - Generic impl --------*- C++ -*-===// +//===-- llvm/Support/ThreadSupport-NoSupport.h - Generic Impl ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -16,7 +16,7 @@ // Users should never #include this file directly! As such, no include guards // are needed. -#ifndef SUPPORT_THREADSUPPORT_H +#ifndef LLVM_SUPPORT_THREADSUPPORT_H #error "Code should not #include Support/ThreadSupport-NoSupport.h directly!" #endif diff --git a/include/llvm/Support/ThreadSupport-PThreads.h b/include/llvm/Support/ThreadSupport-PThreads.h index 6bbe682c08..1bd3f32a99 100644 --- a/include/llvm/Support/ThreadSupport-PThreads.h +++ b/include/llvm/Support/ThreadSupport-PThreads.h @@ -1,4 +1,4 @@ -//===-- Support/ThreadSupport-PThreads.h - PThreads support -----*- C++ -*-===// +//===-- llvm/Support/ThreadSupport-PThreads.h - PThreads support *- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -15,7 +15,7 @@ // Users should never #include this file directly! As such, no include guards // are needed. -#ifndef SUPPORT_THREADSUPPORT_H +#ifndef LLVM_SUPPORT_THREADSUPPORT_H #error "Code should not #include Support/ThreadSupport/PThreads.h directly!" #endif diff --git a/include/llvm/Support/ThreadSupport.h.in b/include/llvm/Support/ThreadSupport.h.in index 470010219f..48428b8cde 100644 --- a/include/llvm/Support/ThreadSupport.h.in +++ b/include/llvm/Support/ThreadSupport.h.in @@ -18,9 +18,9 @@ #define SUPPORT_THREADSUPPORT_H #if @HAVE_PTHREAD_MUTEX_LOCK@ -#include "Support/ThreadSupport-PThreads.h" +#include "llvm/Support/ThreadSupport-PThreads.h" #else -#include "Support/ThreadSupport-NoSupport.h" +#include "llvm/Support/ThreadSupport-NoSupport.h" #endif // If no system support is available namespace llvm { diff --git a/include/llvm/Support/Timer.h b/include/llvm/Support/Timer.h index ac465bb95b..a31dd3d93c 100644 --- a/include/llvm/Support/Timer.h +++ b/include/llvm/Support/Timer.h @@ -1,4 +1,4 @@ -//===-- Support/Timer.h - Interval Timing Support ---------------*- C++ -*-===// +//===-- llvm/Support/Timer.h - Interval Timing Support ----------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_TIMER_H -#define SUPPORT_TIMER_H +#ifndef LLVM_SUPPORT_TIMER_H +#define LLVM_SUPPORT_TIMER_H #include <string> #include <vector> diff --git a/include/llvm/Support/ToolRunner.h b/include/llvm/Support/ToolRunner.h index bd085eab6d..c5d89da46d 100644 --- a/include/llvm/Support/ToolRunner.h +++ b/include/llvm/Support/ToolRunner.h @@ -1,4 +1,4 @@ -//===-- Support/ToolRunner.h ------------------------------------*- C++ -*-===// +//===-- llvm/Support/ToolRunner.h -------------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -14,10 +14,10 @@ // //===----------------------------------------------------------------------===// -#ifndef TOOLRUNNER_H -#define TOOLRUNNER_H +#ifndef LLVM_SUPPORT_TOOLRUNNER_H +#define LLVM_SUPPORT_TOOLRUNNER_H -#include "Support/SystemUtils.h" +#include "llvm/Support/SystemUtils.h" #include <exception> #include <vector> diff --git a/include/llvm/Support/TypeInfo.h b/include/llvm/Support/TypeInfo.h index e23f906afa..54043af9de 100644 --- a/include/llvm/Support/TypeInfo.h +++ b/include/llvm/Support/TypeInfo.h @@ -1,4 +1,4 @@ -//===- Support/TypeInfo.h - Support class for type_info objects -*- C++ -*-===// +//===- llvm/Support/TypeInfo.h - Support for type_info objects -*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -13,8 +13,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_TYPEINFO_H -#define SUPPORT_TYPEINFO_H +#ifndef LLVM_SUPPORT_TYPEINFO_H +#define LLVM_SUPPORT_TYPEINFO_H #include <typeinfo> diff --git a/include/llvm/Support/type_traits.h b/include/llvm/Support/type_traits.h index de932b28db..36bbdb8ea4 100644 --- a/include/llvm/Support/type_traits.h +++ b/include/llvm/Support/type_traits.h @@ -1,4 +1,4 @@ -//===- Support/type_traits.h - Simplfied type traits ------------*- C++ -*-===// +//===- llvm/Support/type_traits.h - Simplfied type traits -------*- C++ -*-===// // // The LLVM Compiler Infrastructure // diff --git a/include/llvm/Target/TargetData.h b/include/llvm/Target/TargetData.h index d354d2098c..9de9d7044a 100644 --- a/include/llvm/Target/TargetData.h +++ b/include/llvm/Target/TargetData.h @@ -21,7 +21,7 @@ #define LLVM_TARGET_TARGETDATA_H #include "llvm/Pass.h" -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include <vector> #include <string> diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h index bc25fa722b..d5f4b94d96 100644 --- a/include/llvm/Target/TargetInstrInfo.h +++ b/include/llvm/Target/TargetInstrInfo.h @@ -15,7 +15,7 @@ #define LLVM_TARGET_TARGETINSTRINFO_H #include "llvm/CodeGen/MachineBasicBlock.h" -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include <vector> #include <cassert> diff --git a/include/llvm/Target/TargetMachineRegistry.h b/include/llvm/Target/TargetMachineRegistry.h index 008b69c1db..08ab56e10a 100644 --- a/include/llvm/Target/TargetMachineRegistry.h +++ b/include/llvm/Target/TargetMachineRegistry.h @@ -17,7 +17,7 @@ #ifndef LLVM_TARGET_TARGETMACHINEREGISTRY_H #define LLVM_TARGET_TARGETMACHINEREGISTRY_H -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" namespace llvm { class Module; diff --git a/include/llvm/Target/TargetSchedInfo.h b/include/llvm/Target/TargetSchedInfo.h index b7bd81f35a..f2a3560496 100644 --- a/include/llvm/Target/TargetSchedInfo.h +++ b/include/llvm/Target/TargetSchedInfo.h @@ -17,7 +17,7 @@ #define LLVM_TARGET_TARGETSCHEDINFO_H #include "llvm/Target/TargetInstrInfo.h" -#include "Support/hash_map" +#include "llvm/ADT/hash_map" #include <string> namespace llvm { diff --git a/include/llvm/Type.h b/include/llvm/Type.h index fcaa9f5669..dbc7881eb1 100644 --- a/include/llvm/Type.h +++ b/include/llvm/Type.h @@ -35,9 +35,9 @@ #define LLVM_TYPE_H #include "AbstractTypeUser.h" -#include "Support/Casting.h" -#include "Support/GraphTraits.h" -#include "Support/iterator" +#include "llvm/Support/Casting.h" +#include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/iterator" #include <vector> namespace llvm { diff --git a/include/llvm/Use.h b/include/llvm/Use.h index fb5eafb712..03afc24580 100644 --- a/include/llvm/Use.h +++ b/include/llvm/Use.h @@ -16,7 +16,7 @@ #ifndef LLVM_USE_H #define LLVM_USE_H -#include "Support/ilist" +#include "llvm/ADT/ilist" namespace llvm { diff --git a/include/llvm/Value.h b/include/llvm/Value.h index f5381efd0d..2b10a841a0 100644 --- a/include/llvm/Value.h +++ b/include/llvm/Value.h @@ -19,7 +19,7 @@ #include "llvm/AbstractTypeUser.h" #include "llvm/Use.h" -#include "Support/Casting.h" +#include "llvm/Support/Casting.h" #include <string> namespace llvm { |