diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2004-09-01 22:55:40 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2004-09-01 22:55:40 +0000 |
| commit | 7c16caa33600bc473532fc2730aad1f62738b3ef (patch) | |
| tree | 55aef6dec49750079b647bafb7e8e2983db01e67 | |
| parent | fae8f6a4fbdcda9f16c3b8ad70c14b58830626df (diff) | |
| download | bcm5719-llvm-7c16caa33600bc473532fc2730aad1f62738b3ef.tar.gz bcm5719-llvm-7c16caa33600bc473532fc2730aad1f62738b3ef.zip | |
Changes For Bug 352
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM
public header files must be under include/llvm/.
llvm-svn: 16137
341 files changed, 720 insertions, 713 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 603a7c520b6..86cf136939b 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -8,7 +8,7 @@ dnl Quit if the source directory has already been configured. dnl NOTE: This relies upon undocumented autoconf behavior. if test ${srcdir} != "." then - if test -f ${srcdir}/include/Config/config.h + if test -f ${srcdir}/include/llvm/Config/config.h then AC_MSG_ERROR([Already configured in ${srcdir}]) fi @@ -27,15 +27,15 @@ do done dnl Configure header files -AC_CONFIG_HEADERS(include/Config/config.h) +AC_CONFIG_HEADERS(include/llvm/Config/config.h) dnl Configure other output file AC_CONFIG_FILES(Makefile.config - include/Support/DataTypes.h - include/Support/ThreadSupport.h - include/Support/hash_map - include/Support/hash_set - include/Support/iterator) + include/llvm/Support/DataTypes.h + include/llvm/Support/ThreadSupport.h + include/llvm/ADT/hash_map + include/llvm/ADT/hash_set + include/llvm/ADT/iterator) dnl Do special configuration of Makefiles AC_CONFIG_MAKEFILE(Makefile) diff --git a/llvm/configure b/llvm/configure index 325ed37404d..3f7f65b0dbd 100755 --- a/llvm/configure +++ b/llvm/configure @@ -1544,7 +1544,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. if test ${srcdir} != "." then - if test -f ${srcdir}/include/Config/config.h + if test -f ${srcdir}/include/llvm/Config/config.h then { { echo "$as_me:$LINENO: error: Already configured in ${srcdir}" >&5 echo "$as_me: error: Already configured in ${srcdir}" >&2;} @@ -1566,10 +1566,10 @@ subdirs="$subdirs projects/${i}" fi done - ac_config_headers="$ac_config_headers include/Config/config.h" + ac_config_headers="$ac_config_headers include/llvm/Config/config.h" - ac_config_files="$ac_config_files Makefile.config include/Support/DataTypes.h include/Support/ThreadSupport.h include/Support/hash_map include/Support/hash_set include/Support/iterator" + ac_config_files="$ac_config_files Makefile.config include/llvm/Support/DataTypes.h include/llvm/Support/ThreadSupport.h include/llvm/ADT/hash_map include/llvm/ADT/hash_set include/llvm/ADT/iterator" ac_config_commands="$ac_config_commands Makefile" @@ -24450,11 +24450,11 @@ do case "$ac_config_target" in # Handling of arguments. "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;; - "include/Support/DataTypes.h" ) CONFIG_FILES="$CONFIG_FILES include/Support/DataTypes.h" ;; - "include/Support/ThreadSupport.h" ) CONFIG_FILES="$CONFIG_FILES include/Support/ThreadSupport.h" ;; - "include/Support/hash_map" ) CONFIG_FILES="$CONFIG_FILES include/Support/hash_map" ;; - "include/Support/hash_set" ) CONFIG_FILES="$CONFIG_FILES include/Support/hash_set" ;; - "include/Support/iterator" ) CONFIG_FILES="$CONFIG_FILES include/Support/iterator" ;; + "include/llvm/Support/DataTypes.h" ) CONFIG_FILES="$CONFIG_FILES include/llvm/Support/DataTypes.h" ;; + "include/llvm/Support/ThreadSupport.h" ) CONFIG_FILES="$CONFIG_FILES include/llvm/Support/ThreadSupport.h" ;; + "include/llvm/ADT/hash_map" ) CONFIG_FILES="$CONFIG_FILES include/llvm/ADT/hash_map" ;; + "include/llvm/ADT/hash_set" ) CONFIG_FILES="$CONFIG_FILES include/llvm/ADT/hash_set" ;; + "include/llvm/ADT/iterator" ) CONFIG_FILES="$CONFIG_FILES include/llvm/ADT/iterator" ;; "lib/System/platform" ) CONFIG_LINKS="$CONFIG_LINKS lib/System/platform:lib/System/$platform_type" ;; "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Makefile.common" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;; @@ -24507,7 +24507,7 @@ do "tools/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/Makefile" ;; "utils/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS utils/Makefile" ;; "projects/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/Makefile" ;; - "include/Config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/Config/config.h" ;; + "include/llvm/Config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/Config/config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; diff --git a/llvm/include/Support/BitSetVector.h b/llvm/include/llvm/ADT/BitSetVector.h index 276af0a68a6..73c5841ad6e 100644 --- a/llvm/include/Support/BitSetVector.h +++ b/llvm/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/llvm/include/Support/DenseMap.h b/llvm/include/llvm/ADT/DenseMap.h index 4f6dc91bb63..c141a6c6f46 100644 --- a/llvm/include/Support/DenseMap.h +++ b/llvm/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/llvm/include/Support/DepthFirstIterator.h b/llvm/include/llvm/ADT/DepthFirstIterator.h index c465f4e549e..d18ca9d582c 100644 --- a/llvm/include/Support/DepthFirstIterator.h +++ b/llvm/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/llvm/include/Support/EquivalenceClasses.h b/llvm/include/llvm/ADT/EquivalenceClasses.h index 127183614be..cb4b8bcc32f 100644 --- a/llvm/include/Support/EquivalenceClasses.h +++ b/llvm/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/llvm/include/Support/GraphTraits.h b/llvm/include/llvm/ADT/GraphTraits.h index 4ff74176a7a..e5765bb713b 100644 --- a/llvm/include/Support/GraphTraits.h +++ b/llvm/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/llvm/include/Support/HashExtras.h b/llvm/include/llvm/ADT/HashExtras.h index 67f65b5f3ac..f82115a07c5 100644 --- a/llvm/include/Support/HashExtras.h +++ b/llvm/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/llvm/include/Support/PostOrderIterator.h b/llvm/include/llvm/ADT/PostOrderIterator.h index d66c4b84c40..8ae46768b5a 100644 --- a/llvm/include/Support/PostOrderIterator.h +++ b/llvm/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/llvm/include/Support/SCCIterator.h b/llvm/include/llvm/ADT/SCCIterator.h index 2ea780ca92d..9cccd123247 100644 --- a/llvm/include/Support/SCCIterator.h +++ b/llvm/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/llvm/include/Support/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h index b6379d26232..14b61bc916c 100644 --- a/llvm/include/Support/STLExtras.h +++ b/llvm/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/llvm/include/Support/SetOperations.h b/llvm/include/llvm/ADT/SetOperations.h index bb1e68e6b29..3be8babc38a 100644 --- a/llvm/include/Support/SetOperations.h +++ b/llvm/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/llvm/include/Support/SetVector.h b/llvm/include/llvm/ADT/SetVector.h index c72f49bce89..6135e532861 100644 --- a/llvm/include/Support/SetVector.h +++ b/llvm/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/llvm/include/Support/Statistic.h b/llvm/include/llvm/ADT/Statistic.h index 79d8f9d66ed..31e9ae110d1 100644 --- a/llvm/include/Support/Statistic.h +++ b/llvm/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/llvm/include/Support/StringExtras.h b/llvm/include/llvm/ADT/StringExtras.h index fcfa65f232f..7e25f654d8f 100644 --- a/llvm/include/Support/StringExtras.h +++ b/llvm/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/llvm/include/Support/Tree.h b/llvm/include/llvm/ADT/Tree.h index 48ecf5b06dc..3193eecba21 100644 --- a/llvm/include/Support/Tree.h +++ b/llvm/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/llvm/include/Support/VectorExtras.h b/llvm/include/llvm/ADT/VectorExtras.h index cf7cf5d2ebb..adc3ff720de 100644 --- a/llvm/include/Support/VectorExtras.h +++ b/llvm/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/llvm/include/Support/hash_map.in b/llvm/include/llvm/ADT/hash_map.in index 0253de788fe..9f09ef2ba1c 100644 --- a/llvm/include/Support/hash_map.in +++ b/llvm/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/llvm/include/Support/hash_set.in b/llvm/include/llvm/ADT/hash_set.in index 49c5d732e8f..6da8c7f6a31 100644 --- a/llvm/include/Support/hash_set.in +++ b/llvm/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/llvm/include/Support/ilist b/llvm/include/llvm/ADT/ilist index 9d9fdf0fdb8..8c447c92e9b 100644 --- a/llvm/include/Support/ilist +++ b/llvm/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/llvm/include/Support/iterator.in b/llvm/include/llvm/ADT/iterator.in index 93813e19859..072beb71ee6 100644 --- a/llvm/include/Support/iterator.in +++ b/llvm/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/llvm/include/llvm/Analysis/AliasSetTracker.h b/llvm/include/llvm/Analysis/AliasSetTracker.h index 544b2b945de..ddcbbb0ad53 100644 --- a/llvm/include/llvm/Analysis/AliasSetTracker.h +++ b/llvm/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/llvm/include/llvm/Analysis/CallGraph.h b/llvm/include/llvm/Analysis/CallGraph.h index 86a2b53ad49..2a1f49c83c8 100644 --- a/llvm/include/llvm/Analysis/CallGraph.h +++ b/llvm/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/llvm/include/llvm/Analysis/ConstantsScanner.h b/llvm/include/llvm/Analysis/ConstantsScanner.h index e1533c35bb0..48c0bd08759 100644 --- a/llvm/include/llvm/Analysis/ConstantsScanner.h +++ b/llvm/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/llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h b/llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h index 608cd198efc..efb31517d12 100644 --- a/llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h +++ b/llvm/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/llvm/include/llvm/Analysis/DataStructure/DSSupport.h b/llvm/include/llvm/Analysis/DataStructure/DSSupport.h index 8cce6c98fde..e5bf3904728 100644 --- a/llvm/include/llvm/Analysis/DataStructure/DSSupport.h +++ b/llvm/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/llvm/include/llvm/Analysis/DataStructure/DataStructure.h b/llvm/include/llvm/Analysis/DataStructure/DataStructure.h index f210003213c..9351ed4c988 100644 --- a/llvm/include/llvm/Analysis/DataStructure/DataStructure.h +++ b/llvm/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/llvm/include/llvm/Analysis/Interval.h b/llvm/include/llvm/Analysis/Interval.h index 0d5912305bc..448bcbc803a 100644 --- a/llvm/include/llvm/Analysis/Interval.h +++ b/llvm/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/llvm/include/llvm/Analysis/LoopInfo.h b/llvm/include/llvm/Analysis/LoopInfo.h index 38f9264923b..c5eec834287 100644 --- a/llvm/include/llvm/Analysis/LoopInfo.h +++ b/llvm/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/llvm/include/llvm/BasicBlock.h b/llvm/include/llvm/BasicBlock.h index 27acba4c62a..9c82da266ef 100644 --- a/llvm/include/llvm/BasicBlock.h +++ b/llvm/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/llvm/include/llvm/CodeGen/MachineBasicBlock.h b/llvm/include/llvm/CodeGen/MachineBasicBlock.h index fb037402903..578f2b6c60f 100644 --- a/llvm/include/llvm/CodeGen/MachineBasicBlock.h +++ b/llvm/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/llvm/include/llvm/CodeGen/MachineCodeEmitter.h b/llvm/include/llvm/CodeGen/MachineCodeEmitter.h index a46a2c5b59e..0daab91faf7 100644 --- a/llvm/include/llvm/CodeGen/MachineCodeEmitter.h +++ b/llvm/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/llvm/include/llvm/CodeGen/MachineFunction.h b/llvm/include/llvm/CodeGen/MachineFunction.h index 69b86a640e8..4420c3b84e8 100644 --- a/llvm/include/llvm/CodeGen/MachineFunction.h +++ b/llvm/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/llvm/include/llvm/CodeGen/MachineInstr.h b/llvm/include/llvm/CodeGen/MachineInstr.h index 3a01ab0fbfa..a9f1352b47b 100644 --- a/llvm/include/llvm/CodeGen/MachineInstr.h +++ b/llvm/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/llvm/include/llvm/CodeGen/SSARegMap.h b/llvm/include/llvm/CodeGen/SSARegMap.h index afed38a334e..893b0c71670 100644 --- a/llvm/include/llvm/CodeGen/SSARegMap.h +++ b/llvm/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/llvm/include/llvm/CodeGen/SchedGraphCommon.h b/llvm/include/llvm/CodeGen/SchedGraphCommon.h index fbb9dac7517..167bfb0f2d2 100644 --- a/llvm/include/llvm/CodeGen/SchedGraphCommon.h +++ b/llvm/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/llvm/include/llvm/CodeGen/SelectionDAG.h b/llvm/include/llvm/CodeGen/SelectionDAG.h index 4719bf9d21f..796ee135350 100644 --- a/llvm/include/llvm/CodeGen/SelectionDAG.h +++ b/llvm/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/llvm/include/Config/alloca.h b/llvm/include/llvm/Config/alloca.h index 297b56fa7c5..d2bbec6e526 100644 --- a/llvm/include/Config/alloca.h +++ b/llvm/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/llvm/include/Config/config.h.in b/llvm/include/llvm/Config/config.h.in index fe0c77c8af3..c3046d22d00 100644 --- a/llvm/include/Config/config.h.in +++ b/llvm/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/llvm/include/Config/dlfcn.h b/llvm/include/llvm/Config/dlfcn.h index c7ce5b19688..bf51315ce25 100644 --- a/llvm/include/Config/dlfcn.h +++ b/llvm/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/llvm/include/Config/fcntl.h b/llvm/include/llvm/Config/fcntl.h index ed8a1c839b5..2d0d44d9565 100644 --- a/llvm/include/Config/fcntl.h +++ b/llvm/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/llvm/include/Config/limits.h b/llvm/include/llvm/Config/limits.h index e5a787e5e14..1182d90b57b 100644 --- a/llvm/include/Config/limits.h +++ b/llvm/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/llvm/include/Config/malloc.h b/llvm/include/llvm/Config/malloc.h index c78408a3598..7d16a406705 100644 --- a/llvm/include/Config/malloc.h +++ b/llvm/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/llvm/include/Config/memory.h b/llvm/include/llvm/Config/memory.h index f75902b5bc5..f6fbbaf7359 100644 --- a/llvm/include/Config/memory.h +++ b/llvm/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/llvm/include/Config/pagesize.h b/llvm/include/llvm/Config/pagesize.h index f37b29770d4..adbf87893ee 100644 --- a/llvm/include/Config/pagesize.h +++ b/llvm/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/llvm/include/Config/stdint.h b/llvm/include/llvm/Config/stdint.h index a98961063ef..44db789d0d3 100644 --- a/llvm/include/Config/stdint.h +++ b/llvm/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/llvm/include/Config/sys/mman.h b/llvm/include/llvm/Config/sys/mman.h index 7f51e7fbfbe..92f394989af 100644 --- a/llvm/include/Config/sys/mman.h +++ b/llvm/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/llvm/include/Config/sys/resource.h b/llvm/include/llvm/Config/sys/resource.h index 1f4cc694b29..11cb7709ca4 100644 --- a/llvm/include/Config/sys/resource.h +++ b/llvm/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/llvm/include/Config/sys/stat.h b/llvm/include/llvm/Config/sys/stat.h index 9669bcf927b..98b7f72e0a4 100644 --- a/llvm/include/Config/sys/stat.h +++ b/llvm/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/llvm/include/Config/sys/time.h b/llvm/include/llvm/Config/sys/time.h index 3e0ea1e8109..f5ca3961f25 100644 --- a/llvm/include/Config/sys/time.h +++ b/llvm/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/llvm/include/Config/sys/types.h b/llvm/include/llvm/Config/sys/types.h index f0a7abec355..fd6becd38f0 100644 --- a/llvm/include/Config/sys/types.h +++ b/llvm/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/llvm/include/Config/sys/wait.h b/llvm/include/llvm/Config/sys/wait.h index b3db60e435c..a1c70fbc6c4 100644 --- a/llvm/include/Config/sys/wait.h +++ b/llvm/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/llvm/include/Config/time.h b/llvm/include/llvm/Config/time.h index b2f3e6ee053..6d66efad1c6 100644 --- a/llvm/include/Config/time.h +++ b/llvm/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/llvm/include/Config/unistd.h b/llvm/include/llvm/Config/unistd.h index 847db7a3c6e..d6e90d0f9f4 100644 --- a/llvm/include/Config/unistd.h +++ b/llvm/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/llvm/include/Config/windows.h b/llvm/include/llvm/Config/windows.h index fded99fba8e..ab443911a2f 100644 --- a/llvm/include/Config/windows.h +++ b/llvm/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/llvm/include/llvm/Constants.h b/llvm/include/llvm/Constants.h index 5ef2cb01322..d0f577311eb 100644 --- a/llvm/include/llvm/Constants.h +++ b/llvm/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/llvm/include/llvm/ExecutionEngine/GenericValue.h b/llvm/include/llvm/ExecutionEngine/GenericValue.h index 7cf1a7b3952..6ea4366784b 100644 --- a/llvm/include/llvm/ExecutionEngine/GenericValue.h +++ b/llvm/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/llvm/include/llvm/Function.h b/llvm/include/llvm/Function.h index b363191b93c..9e17f2602cc 100644 --- a/llvm/include/llvm/Function.h +++ b/llvm/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/llvm/include/Support/Annotation.h b/llvm/include/llvm/Support/Annotation.h index efca20a3ec0..4325836c290 100644 --- a/llvm/include/Support/Annotation.h +++ b/llvm/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/llvm/include/llvm/Support/CFG.h b/llvm/include/llvm/Support/CFG.h index a20265cd0c4..badb846bac3 100644 --- a/llvm/include/llvm/Support/CFG.h +++ b/llvm/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/llvm/include/Support/Casting.h b/llvm/include/llvm/Support/Casting.h index abc80aac7af..d1897548657 100644 --- a/llvm/include/Support/Casting.h +++ b/llvm/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/llvm/include/Support/CommandLine.h b/llvm/include/llvm/Support/CommandLine.h index 053b823669e..2c38e0aac06 100644 --- a/llvm/include/Support/CommandLine.h +++ b/llvm/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/llvm/include/llvm/Support/ConstantRange.h b/llvm/include/llvm/Support/ConstantRange.h index 30618a16921..0c8b3b6b4cc 100644 --- a/llvm/include/llvm/Support/ConstantRange.h +++ b/llvm/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/llvm/include/Support/DOTGraphTraits.h b/llvm/include/llvm/Support/DOTGraphTraits.h index 7dbc4ff0b65..b83b759f407 100644 --- a/llvm/include/Support/DOTGraphTraits.h +++ b/llvm/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/llvm/include/Support/DataTypes.h.in b/llvm/include/llvm/Support/DataTypes.h.in index 180258478d3..180258478d3 100644 --- a/llvm/include/Support/DataTypes.h.in +++ b/llvm/include/llvm/Support/DataTypes.h.in diff --git a/llvm/include/Support/Debug.h b/llvm/include/llvm/Support/Debug.h index f0a1b3dc5bd..263547c9804 100644 --- a/llvm/include/Support/Debug.h +++ b/llvm/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/llvm/include/Support/DynamicLinker.h b/llvm/include/llvm/Support/DynamicLinker.h index fec9a45296c..4f0bb58cab1 100644 --- a/llvm/include/Support/DynamicLinker.h +++ b/llvm/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/llvm/include/Support/ELF.h b/llvm/include/llvm/Support/ELF.h index e4b87b90222..8d9f693cf6c 100644 --- a/llvm/include/Support/ELF.h +++ b/llvm/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/llvm/include/Support/FileUtilities.h b/llvm/include/llvm/Support/FileUtilities.h index 78983b8352c..c9f52c32488 100644 --- a/llvm/include/Support/FileUtilities.h +++ b/llvm/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/llvm/include/Support/GraphWriter.h b/llvm/include/llvm/Support/GraphWriter.h index c6a5c3cdc94..feb9900d3b8 100644 --- a/llvm/include/Support/GraphWriter.h +++ b/llvm/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/llvm/include/Support/LeakDetector.h b/llvm/include/llvm/Support/LeakDetector.h index e2ce9c50bea..6ca5405bc43 100644 --- a/llvm/include/Support/LeakDetector.h +++ b/llvm/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/llvm/include/Support/MallocAllocator.h b/llvm/include/llvm/Support/MallocAllocator.h index 3e3da4139c1..c17517e2a0c 100644 --- a/llvm/include/Support/MallocAllocator.h +++ b/llvm/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/llvm/include/llvm/Support/Mangler.h b/llvm/include/llvm/Support/Mangler.h index 4043d85a715..14d68b59d32 100644 --- a/llvm/include/llvm/Support/Mangler.h +++ b/llvm/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/llvm/include/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h index c1384d3eff5..bfc175f2c1f 100644 --- a/llvm/include/Support/MathExtras.h +++ b/llvm/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/llvm/include/llvm/Support/PassNameParser.h b/llvm/include/llvm/Support/PassNameParser.h index 0ffcabad52a..71ebe41a459 100644 --- a/llvm/include/llvm/Support/PassNameParser.h +++ b/llvm/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/llvm/include/Support/PluginLoader.h b/llvm/include/llvm/Support/PluginLoader.h index 7410895c3af..48f8a7d8dc2 100644 --- a/llvm/include/Support/PluginLoader.h +++ b/llvm/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/llvm/include/Support/SlowOperationInformer.h b/llvm/include/llvm/Support/SlowOperationInformer.h index 67edf7df42b..896fd3fb062 100644 --- a/llvm/include/Support/SlowOperationInformer.h +++ b/llvm/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/llvm/include/Support/SystemUtils.h b/llvm/include/llvm/Support/SystemUtils.h index b8c130cc974..aea7df80eba 100644 --- a/llvm/include/Support/SystemUtils.h +++ b/llvm/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/llvm/include/Support/ThreadSupport-NoSupport.h b/llvm/include/llvm/Support/ThreadSupport-NoSupport.h index 5dc954efab1..3602e21cea4 100644 --- a/llvm/include/Support/ThreadSupport-NoSupport.h +++ b/llvm/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/llvm/include/Support/ThreadSupport-PThreads.h b/llvm/include/llvm/Support/ThreadSupport-PThreads.h index 6bbe682c089..1bd3f32a99e 100644 --- a/llvm/include/Support/ThreadSupport-PThreads.h +++ b/llvm/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/llvm/include/Support/ThreadSupport.h.in b/llvm/include/llvm/Support/ThreadSupport.h.in index 470010219fc..48428b8cdef 100644 --- a/llvm/include/Support/ThreadSupport.h.in +++ b/llvm/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/llvm/include/Support/Timer.h b/llvm/include/llvm/Support/Timer.h index ac465bb95b2..a31dd3d93cf 100644 --- a/llvm/include/Support/Timer.h +++ b/llvm/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/llvm/include/llvm/Support/ToolRunner.h b/llvm/include/llvm/Support/ToolRunner.h index bd085eab6d0..c5d89da46df 100644 --- a/llvm/include/llvm/Support/ToolRunner.h +++ b/llvm/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/llvm/include/Support/TypeInfo.h b/llvm/include/llvm/Support/TypeInfo.h index e23f906afa7..54043af9def 100644 --- a/llvm/include/Support/TypeInfo.h +++ b/llvm/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/llvm/include/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h index de932b28db8..36bbdb8ea42 100644 --- a/llvm/include/Support/type_traits.h +++ b/llvm/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/llvm/include/llvm/Target/TargetData.h b/llvm/include/llvm/Target/TargetData.h index d354d2098ce..9de9d7044a8 100644 --- a/llvm/include/llvm/Target/TargetData.h +++ b/llvm/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/llvm/include/llvm/Target/TargetInstrInfo.h b/llvm/include/llvm/Target/TargetInstrInfo.h index bc25fa722b7..d5f4b94d967 100644 --- a/llvm/include/llvm/Target/TargetInstrInfo.h +++ b/llvm/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/llvm/include/llvm/Target/TargetMachineRegistry.h b/llvm/include/llvm/Target/TargetMachineRegistry.h index 008b69c1db4..08ab56e10ae 100644 --- a/llvm/include/llvm/Target/TargetMachineRegistry.h +++ b/llvm/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/llvm/include/llvm/Target/TargetSchedInfo.h b/llvm/include/llvm/Target/TargetSchedInfo.h index b7bd81f35a6..f2a3560496c 100644 --- a/llvm/include/llvm/Target/TargetSchedInfo.h +++ b/llvm/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/llvm/include/llvm/Type.h b/llvm/include/llvm/Type.h index fcaa9f56690..dbc7881eb1f 100644 --- a/llvm/include/llvm/Type.h +++ b/llvm/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/llvm/include/llvm/Use.h b/llvm/include/llvm/Use.h index fb5eafb7122..03afc24580f 100644 --- a/llvm/include/llvm/Use.h +++ b/llvm/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/llvm/include/llvm/Value.h b/llvm/include/llvm/Value.h index f5381efd0d7..2b10a841a01 100644 --- a/llvm/include/llvm/Value.h +++ b/llvm/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 { diff --git a/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp b/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp index b4a183d1c40..af0a25a409d 100644 --- a/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp +++ b/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp @@ -24,7 +24,7 @@ #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/InstIterator.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <iostream> #include <set> diff --git a/llvm/lib/Analysis/CFGPrinter.cpp b/llvm/lib/Analysis/CFGPrinter.cpp index 9eaaec690b8..88f9843c0be 100644 --- a/llvm/lib/Analysis/CFGPrinter.cpp +++ b/llvm/lib/Analysis/CFGPrinter.cpp @@ -23,7 +23,7 @@ #include "llvm/Analysis/CFGPrinter.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/CFG.h" -#include "Support/GraphWriter.h" +#include "llvm/Support/GraphWriter.h" #include <sstream> #include <fstream> using namespace llvm; diff --git a/llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp b/llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp index 9f2124a1bb5..4bc6fafcf63 100644 --- a/llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp +++ b/llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp @@ -16,8 +16,8 @@ #include "llvm/Analysis/DataStructure/DataStructure.h" #include "llvm/Module.h" -#include "Support/Statistic.h" -#include "Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/Debug.h" #include "DSCallSiteIterator.h" using namespace llvm; diff --git a/llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp b/llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp index 589891f557f..b2a0f4ba9b8 100644 --- a/llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp +++ b/llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp @@ -16,10 +16,10 @@ #include "llvm/Analysis/DataStructure/DataStructure.h" #include "llvm/Module.h" #include "llvm/Analysis/DataStructure/DSGraph.h" -#include "Support/Debug.h" -#include "Support/SCCIterator.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/SCCIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; namespace { diff --git a/llvm/lib/Analysis/DataStructure/DataStructure.cpp b/llvm/lib/Analysis/DataStructure/DataStructure.cpp index 83aa890d96f..de34265f2ab 100644 --- a/llvm/lib/Analysis/DataStructure/DataStructure.cpp +++ b/llvm/lib/Analysis/DataStructure/DataStructure.cpp @@ -18,12 +18,12 @@ #include "llvm/DerivedTypes.h" #include "llvm/Target/TargetData.h" #include "llvm/Assembly/Writer.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/DepthFirstIterator.h" -#include "Support/STLExtras.h" -#include "Support/Statistic.h" -#include "Support/Timer.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/Timer.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp b/llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp index 6c2e5df3a77..f7a1ed9af3f 100644 --- a/llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp +++ b/llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp @@ -16,7 +16,7 @@ #include "llvm/Analysis/DataStructure/DSGraph.h" #include "llvm/Module.h" #include "llvm/Constant.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Analysis/DataStructure/DataStructureStats.cpp b/llvm/lib/Analysis/DataStructure/DataStructureStats.cpp index 1bfe09aba51..7e3f85f3a69 100644 --- a/llvm/lib/Analysis/DataStructure/DataStructureStats.cpp +++ b/llvm/lib/Analysis/DataStructure/DataStructureStats.cpp @@ -17,7 +17,7 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Support/InstVisitor.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <vector> using namespace llvm; diff --git a/llvm/lib/Analysis/DataStructure/DependenceGraph.h b/llvm/lib/Analysis/DataStructure/DependenceGraph.h index 679ecd7d135..520b0085282 100644 --- a/llvm/lib/Analysis/DataStructure/DependenceGraph.h +++ b/llvm/lib/Analysis/DataStructure/DependenceGraph.h @@ -24,7 +24,7 @@ #ifndef LLVM_ANALYSIS_DEPENDENCEGRAPH_H #define LLVM_ANALYSIS_DEPENDENCEGRAPH_H -#include "Support/hash_map" +#include "llvm/ADT/hash_map" #include <cassert> #include <iosfwd> #include <utility> diff --git a/llvm/lib/Analysis/DataStructure/GraphChecker.cpp b/llvm/lib/Analysis/DataStructure/GraphChecker.cpp index 5cb37bb23e3..8cef6b37bf1 100644 --- a/llvm/lib/Analysis/DataStructure/GraphChecker.cpp +++ b/llvm/lib/Analysis/DataStructure/GraphChecker.cpp @@ -25,7 +25,7 @@ #include "llvm/Analysis/DataStructure/DataStructure.h" #include "llvm/Analysis/DataStructure/DSGraph.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/Value.h" #include <iostream> #include <set> diff --git a/llvm/lib/Analysis/DataStructure/IPModRef.cpp b/llvm/lib/Analysis/DataStructure/IPModRef.cpp index bf1940ebe64..ccc15f74e49 100644 --- a/llvm/lib/Analysis/DataStructure/IPModRef.cpp +++ b/llvm/lib/Analysis/DataStructure/IPModRef.cpp @@ -16,9 +16,9 @@ #include "llvm/Analysis/DataStructure/DSGraph.h" #include "llvm/Module.h" #include "llvm/Instructions.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/StringExtras.h" #include <vector> namespace llvm { diff --git a/llvm/lib/Analysis/DataStructure/IPModRef.h b/llvm/lib/Analysis/DataStructure/IPModRef.h index 57649da7239..4a825dbea3a 100644 --- a/llvm/lib/Analysis/DataStructure/IPModRef.h +++ b/llvm/lib/Analysis/DataStructure/IPModRef.h @@ -47,8 +47,8 @@ #define LLVM_ANALYSIS_IPMODREF_H #include "llvm/Pass.h" -#include "Support/BitSetVector.h" -#include "Support/hash_map" +#include "llvm/ADT/BitSetVector.h" +#include "llvm/ADT/hash_map" namespace llvm { diff --git a/llvm/lib/Analysis/DataStructure/Local.cpp b/llvm/lib/Analysis/DataStructure/Local.cpp index 34c56dc2ea7..b21f2f10243 100644 --- a/llvm/lib/Analysis/DataStructure/Local.cpp +++ b/llvm/lib/Analysis/DataStructure/Local.cpp @@ -21,9 +21,9 @@ #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Target/TargetData.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Timer.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/Timer.h" // FIXME: This should eventually be a FunctionPass that is automatically // aggregated into a Pass. diff --git a/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp b/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp index 7c39365d06c..49b6425930d 100644 --- a/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp +++ b/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp @@ -25,11 +25,11 @@ #include "llvm/Analysis/DataStructure/DSGraph.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Support/CFG.h" -#include "Support/SCCIterator.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" -#include "Support/hash_map" -#include "Support/hash_set" +#include "llvm/ADT/SCCIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/hash_map" +#include "llvm/ADT/hash_set" namespace llvm { diff --git a/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h b/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h index 04d78dafff8..570a03b679d 100644 --- a/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h +++ b/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h @@ -22,7 +22,7 @@ #include "DependenceGraph.h" #include "llvm/Pass.h" -#include "Support/hash_map" +#include "llvm/ADT/hash_map" namespace llvm { diff --git a/llvm/lib/Analysis/DataStructure/Parallelize.cpp b/llvm/lib/Analysis/DataStructure/Parallelize.cpp index c944b8cc20d..3dcb05ee064 100644 --- a/llvm/lib/Analysis/DataStructure/Parallelize.cpp +++ b/llvm/lib/Analysis/DataStructure/Parallelize.cpp @@ -46,10 +46,10 @@ #include "llvm/Analysis/DataStructure/DSGraph.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" -#include "Support/hash_set" -#include "Support/hash_map" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/hash_set" +#include "llvm/ADT/hash_map" #include <functional> #include <algorithm> using namespace llvm; diff --git a/llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h b/llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h index 5f7f7d581b9..ec6f927a7e6 100644 --- a/llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h +++ b/llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h @@ -43,7 +43,7 @@ /* #include "llvm/Analysis/PostDominators.h" -- see below */ #include "llvm/Instruction.h" #include "llvm/Pass.h" -#include "Support/iterator" +#include "llvm/ADT/iterator" namespace llvm { diff --git a/llvm/lib/Analysis/DataStructure/Printer.cpp b/llvm/lib/Analysis/DataStructure/Printer.cpp index 24bf7683798..c951433f49a 100644 --- a/llvm/lib/Analysis/DataStructure/Printer.cpp +++ b/llvm/lib/Analysis/DataStructure/Printer.cpp @@ -17,9 +17,9 @@ #include "llvm/Module.h" #include "llvm/Constants.h" #include "llvm/Assembly/Writer.h" -#include "Support/CommandLine.h" -#include "Support/GraphWriter.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/GraphWriter.h" +#include "llvm/ADT/Statistic.h" #include <fstream> #include <sstream> using namespace llvm; diff --git a/llvm/lib/Analysis/DataStructure/Steensgaard.cpp b/llvm/lib/Analysis/DataStructure/Steensgaard.cpp index 55a6deb048f..deeb8b34509 100644 --- a/llvm/lib/Analysis/DataStructure/Steensgaard.cpp +++ b/llvm/lib/Analysis/DataStructure/Steensgaard.cpp @@ -18,7 +18,7 @@ #include "llvm/Analysis/DataStructure/DSGraph.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Module.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" using namespace llvm; namespace { diff --git a/llvm/lib/Analysis/DataStructure/TopDownClosure.cpp b/llvm/lib/Analysis/DataStructure/TopDownClosure.cpp index 4635787a041..1d861e8216e 100644 --- a/llvm/lib/Analysis/DataStructure/TopDownClosure.cpp +++ b/llvm/lib/Analysis/DataStructure/TopDownClosure.cpp @@ -18,8 +18,8 @@ #include "llvm/Module.h" #include "llvm/DerivedTypes.h" #include "llvm/Analysis/DataStructure/DSGraph.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Analysis/IPA/Andersens.cpp b/llvm/lib/Analysis/IPA/Andersens.cpp index 54dfd7458d1..7901c91abb3 100644 --- a/llvm/lib/Analysis/IPA/Andersens.cpp +++ b/llvm/lib/Analysis/IPA/Andersens.cpp @@ -58,8 +58,8 @@ #include "llvm/Support/InstIterator.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Analysis/AliasAnalysis.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Analysis/IPA/CallGraph.cpp b/llvm/lib/Analysis/IPA/CallGraph.cpp index 8025ab2d9ac..75e068ba54c 100644 --- a/llvm/lib/Analysis/IPA/CallGraph.cpp +++ b/llvm/lib/Analysis/IPA/CallGraph.cpp @@ -16,7 +16,7 @@ #include "llvm/Module.h" #include "llvm/Instructions.h" #include "llvm/Support/CallSite.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> using namespace llvm; diff --git a/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp b/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp index f4e2efbe1c1..f7d7ab126a3 100644 --- a/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp +++ b/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp @@ -17,7 +17,7 @@ #include "llvm/CallGraphSCCPass.h" #include "llvm/Analysis/CallGraph.h" -#include "Support/SCCIterator.h" +#include "llvm/ADT/SCCIterator.h" using namespace llvm; /// getAnalysisUsage - For this class, we declare that we require and preserve diff --git a/llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp b/llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp index 52a83a1dfd5..23ee99aa59c 100644 --- a/llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp +++ b/llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp @@ -28,7 +28,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/Support/InstIterator.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; static RegisterAnalysis<FindUnsafePointerTypes> diff --git a/llvm/lib/Analysis/IPA/GlobalsModRef.cpp b/llvm/lib/Analysis/IPA/GlobalsModRef.cpp index 219fdbf649b..c1f15ed2385 100644 --- a/llvm/lib/Analysis/IPA/GlobalsModRef.cpp +++ b/llvm/lib/Analysis/IPA/GlobalsModRef.cpp @@ -22,9 +22,9 @@ #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/CallGraph.h" #include "llvm/Support/InstIterator.h" -#include "Support/CommandLine.h" -#include "Support/Statistic.h" -#include "Support/SCCIterator.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/SCCIterator.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Analysis/IPA/PrintSCC.cpp b/llvm/lib/Analysis/IPA/PrintSCC.cpp index 8911cc36e22..e4af831752c 100644 --- a/llvm/lib/Analysis/IPA/PrintSCC.cpp +++ b/llvm/lib/Analysis/IPA/PrintSCC.cpp @@ -29,7 +29,7 @@ #include "llvm/Module.h" #include "llvm/Analysis/CallGraph.h" #include "llvm/Support/CFG.h" -#include "Support/SCCIterator.h" +#include "llvm/ADT/SCCIterator.h" #include <iostream> namespace llvm { diff --git a/llvm/lib/Analysis/InstCount.cpp b/llvm/lib/Analysis/InstCount.cpp index 9177e448000..12d16b081e7 100644 --- a/llvm/lib/Analysis/InstCount.cpp +++ b/llvm/lib/Analysis/InstCount.cpp @@ -14,7 +14,7 @@ #include "llvm/Pass.h" #include "llvm/Function.h" #include "llvm/Support/InstVisitor.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" namespace llvm { diff --git a/llvm/lib/Analysis/IntervalPartition.cpp b/llvm/lib/Analysis/IntervalPartition.cpp index 12c196f2f70..9253f721ab1 100644 --- a/llvm/lib/Analysis/IntervalPartition.cpp +++ b/llvm/lib/Analysis/IntervalPartition.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Analysis/IntervalIterator.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" namespace llvm { diff --git a/llvm/lib/Analysis/LoopInfo.cpp b/llvm/lib/Analysis/LoopInfo.cpp index 131d02a32b8..710f74afe2d 100644 --- a/llvm/lib/Analysis/LoopInfo.cpp +++ b/llvm/lib/Analysis/LoopInfo.cpp @@ -20,7 +20,7 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/CFG.h" -#include "Support/DepthFirstIterator.h" +#include "llvm/ADT/DepthFirstIterator.h" #include <algorithm> #include <iostream> diff --git a/llvm/lib/Analysis/PostDominators.cpp b/llvm/lib/Analysis/PostDominators.cpp index ff202f0151d..e5908c496b4 100644 --- a/llvm/lib/Analysis/PostDominators.cpp +++ b/llvm/lib/Analysis/PostDominators.cpp @@ -14,8 +14,8 @@ #include "llvm/Analysis/PostDominators.h" #include "llvm/Instructions.h" #include "llvm/Support/CFG.h" -#include "Support/DepthFirstIterator.h" -#include "Support/SetOperations.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/SetOperations.h" using namespace llvm; //===----------------------------------------------------------------------===// diff --git a/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp b/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp index 4ab56ce1569..cd3f5753559 100644 --- a/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp +++ b/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp @@ -17,7 +17,7 @@ #include "llvm/Pass.h" #include "llvm/Analysis/ProfileInfo.h" #include "llvm/Analysis/ProfileInfoLoader.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <iostream> using namespace llvm; diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp index cac3b507ba1..efe4d92bff8 100644 --- a/llvm/lib/Analysis/ScalarEvolution.cpp +++ b/llvm/lib/Analysis/ScalarEvolution.cpp @@ -72,8 +72,8 @@ #include "llvm/Support/CFG.h" #include "llvm/Support/ConstantRange.h" #include "llvm/Support/InstIterator.h" -#include "Support/CommandLine.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" #include <cmath> using namespace llvm; diff --git a/llvm/lib/AsmParser/ParserInternals.h b/llvm/lib/AsmParser/ParserInternals.h index 71876a55b46..9fdc8e66f8b 100644 --- a/llvm/lib/AsmParser/ParserInternals.h +++ b/llvm/lib/AsmParser/ParserInternals.h @@ -20,7 +20,7 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Assembly/Parser.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" // Global variables exported from the lexer... extern std::FILE *llvmAsmin; diff --git a/llvm/lib/AsmParser/llvmAsmParser.y b/llvm/lib/AsmParser/llvmAsmParser.y index 8ba89bc879c..1fd8782daea 100644 --- a/llvm/lib/AsmParser/llvmAsmParser.y +++ b/llvm/lib/AsmParser/llvmAsmParser.y @@ -17,7 +17,7 @@ #include "llvm/Module.h" #include "llvm/SymbolTable.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <iostream> #include <list> diff --git a/llvm/lib/Bytecode/Reader/ArchiveReader.cpp b/llvm/lib/Bytecode/Reader/ArchiveReader.cpp index 1d8530fc785..50e11d6ab58 100644 --- a/llvm/lib/Bytecode/Reader/ArchiveReader.cpp +++ b/llvm/lib/Bytecode/Reader/ArchiveReader.cpp @@ -18,7 +18,7 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/Module.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/FileUtilities.h" #include <cstdlib> #include <iostream> using namespace llvm; diff --git a/llvm/lib/Bytecode/Reader/Reader.cpp b/llvm/lib/Bytecode/Reader/Reader.cpp index f0b39d45de9..39f238c9869 100644 --- a/llvm/lib/Bytecode/Reader/Reader.cpp +++ b/llvm/lib/Bytecode/Reader/Reader.cpp @@ -24,7 +24,7 @@ #include "llvm/SymbolTable.h" #include "llvm/Bytecode/Format.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include <sstream> using namespace llvm; @@ -428,14 +428,20 @@ Value * BytecodeReader::getValue(unsigned type, unsigned oNum, bool Create) { if (!Create) return 0; // Do not create a placeholder? + // Did we already create a place holder? std::pair<unsigned,unsigned> KeyValue(type, oNum); ForwardReferenceMap::iterator I = ForwardReferences.lower_bound(KeyValue); if (I != ForwardReferences.end() && I->first == KeyValue) return I->second; // We have already created this placeholder - Value *Val = new Argument(getType(type)); - ForwardReferences.insert(I, std::make_pair(KeyValue, Val)); - return Val; + // If the type exists (it should) + if (const Type* Ty = getType(type)) { + // Create the place holder + Value *Val = new Argument(Ty); + ForwardReferences.insert(I, std::make_pair(KeyValue, Val)); + return Val; + } + throw "Can't create placeholder for value of type slot #" + utostr(type); } /// This is just like getValue, but when a compaction table is in use, it diff --git a/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp b/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp index 2930a42c63d..383e53e9be4 100644 --- a/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp +++ b/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp @@ -17,9 +17,9 @@ #include "Reader.h" #include "llvm/Module.h" #include "llvm/Instructions.h" -#include "Support/FileUtilities.h" -#include "Support/StringExtras.h" -#include "Config/unistd.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/Config/unistd.h" #include <cerrno> using namespace llvm; diff --git a/llvm/lib/Bytecode/Writer/SlotCalculator.cpp b/llvm/lib/Bytecode/Writer/SlotCalculator.cpp index 2656edd8a54..d4145dbcdca 100644 --- a/llvm/lib/Bytecode/Writer/SlotCalculator.cpp +++ b/llvm/lib/Bytecode/Writer/SlotCalculator.cpp @@ -23,8 +23,8 @@ #include "llvm/SymbolTable.h" #include "llvm/Type.h" #include "llvm/Analysis/ConstantsScanner.h" -#include "Support/PostOrderIterator.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <functional> diff --git a/llvm/lib/Bytecode/Writer/Writer.cpp b/llvm/lib/Bytecode/Writer/Writer.cpp index 7db21486034..60a48cc2654 100644 --- a/llvm/lib/Bytecode/Writer/Writer.cpp +++ b/llvm/lib/Bytecode/Writer/Writer.cpp @@ -25,8 +25,8 @@ #include "llvm/Module.h" #include "llvm/SymbolTable.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "Support/STLExtras.h" -#include "Support/Statistic.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/Statistic.h" #include <cstring> #include <algorithm> using namespace llvm; diff --git a/llvm/lib/Bytecode/Writer/WriterInternals.h b/llvm/lib/Bytecode/Writer/WriterInternals.h index e496da9ff8f..8b5f99e94d3 100644 --- a/llvm/lib/Bytecode/Writer/WriterInternals.h +++ b/llvm/lib/Bytecode/Writer/WriterInternals.h @@ -23,7 +23,7 @@ #include "llvm/Bytecode/Writer.h" #include "llvm/Bytecode/Format.h" #include "llvm/Instruction.h" -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include <string> #include <vector> diff --git a/llvm/lib/CodeGen/BranchFolding.cpp b/llvm/lib/CodeGen/BranchFolding.cpp index af2b7250173..cca9f93553c 100644 --- a/llvm/lib/CodeGen/BranchFolding.cpp +++ b/llvm/lib/CodeGen/BranchFolding.cpp @@ -20,7 +20,7 @@ #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; namespace { diff --git a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp index fc4d6a7164d..69ecb90f31d 100644 --- a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp +++ b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp @@ -20,7 +20,7 @@ #include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h" #include "../../Target/SparcV9/SparcV9InstrInfo.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <algorithm> #include <iostream> diff --git a/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp b/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp index e3b3cba5249..00b48d537d3 100644 --- a/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp +++ b/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp @@ -22,7 +22,7 @@ #include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/SparcV9RegInfo.h" #include "../../Target/SparcV9/SparcV9InstrInfo.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> namespace llvm { diff --git a/llvm/lib/CodeGen/InstrSched/SchedGraph.h b/llvm/lib/CodeGen/InstrSched/SchedGraph.h index e327598bd57..53ded6377d0 100644 --- a/llvm/lib/CodeGen/InstrSched/SchedGraph.h +++ b/llvm/lib/CodeGen/InstrSched/SchedGraph.h @@ -22,8 +22,8 @@ #include "llvm/CodeGen/SchedGraphCommon.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Transforms/Scalar.h" -#include "Support/hash_map" -#include "Support/GraphTraits.h" +#include "llvm/ADT/hash_map" +#include "llvm/ADT/GraphTraits.h" namespace llvm { diff --git a/llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp b/llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp index da4492f359d..0ad5f5844e7 100644 --- a/llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp +++ b/llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "llvm/CodeGen/SchedGraphCommon.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> namespace llvm { diff --git a/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp b/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp index 3c0e0b2c33c..0aaece228d8 100644 --- a/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp +++ b/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp @@ -21,7 +21,7 @@ #include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/Support/CFG.h" -#include "Support/PostOrderIterator.h" +#include "llvm/ADT/PostOrderIterator.h" #include <iostream> namespace llvm { diff --git a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h index 74704678066..dd807f788e3 100644 --- a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h +++ b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h @@ -23,7 +23,7 @@ #include "SchedGraph.h" #include "llvm/CodeGen/InstrScheduling.h" #include "llvm/Target/TargetSchedInfo.h" -#include "Support/hash_set" +#include "llvm/ADT/hash_set" #include <list> namespace llvm { diff --git a/llvm/lib/CodeGen/LiveInterval.cpp b/llvm/lib/CodeGen/LiveInterval.cpp index 6bd441f6431..d63cfc60fba 100644 --- a/llvm/lib/CodeGen/LiveInterval.cpp +++ b/llvm/lib/CodeGen/LiveInterval.cpp @@ -19,7 +19,7 @@ //===----------------------------------------------------------------------===// #include "LiveInterval.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> #include <map> using namespace llvm; diff --git a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp index 3c234bbd0e1..95ed508fcb3 100644 --- a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -27,10 +27,10 @@ #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include "VirtRegMap.h" #include <cmath> diff --git a/llvm/lib/CodeGen/LiveVariables.cpp b/llvm/lib/CodeGen/LiveVariables.cpp index 630477d7b65..825b56d784a 100644 --- a/llvm/lib/CodeGen/LiveVariables.cpp +++ b/llvm/lib/CodeGen/LiveVariables.cpp @@ -31,8 +31,8 @@ #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/DepthFirstIterator.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; static RegisterAnalysis<LiveVariables> X("livevars", "Live Variable Analysis"); diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp index 20390a2f50e..f018f9f01f8 100644 --- a/llvm/lib/CodeGen/MachineBasicBlock.cpp +++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp @@ -17,7 +17,7 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include <iostream> using namespace llvm; diff --git a/llvm/lib/CodeGen/MachineFunction.cpp b/llvm/lib/CodeGen/MachineFunction.cpp index 3478e30e1f7..e38e00603a4 100644 --- a/llvm/lib/CodeGen/MachineFunction.cpp +++ b/llvm/lib/CodeGen/MachineFunction.cpp @@ -23,8 +23,8 @@ #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Function.h" #include "llvm/Instructions.h" -#include "Support/LeakDetector.h" -#include "Support/GraphWriter.h" +#include "llvm/Support/LeakDetector.h" +#include "llvm/Support/GraphWriter.h" #include <fstream> #include <iostream> #include <sstream> diff --git a/llvm/lib/CodeGen/MachineInstr.cpp b/llvm/lib/CodeGen/MachineInstr.cpp index 7c5a61ecd1d..a4ae09a6490 100644 --- a/llvm/lib/CodeGen/MachineInstr.cpp +++ b/llvm/lib/CodeGen/MachineInstr.cpp @@ -20,7 +20,7 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/MRegisterInfo.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include <iostream> using namespace llvm; diff --git a/llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp b/llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp index c57cb5a3bdb..b8bbccf8be2 100644 --- a/llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp +++ b/llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp @@ -13,7 +13,7 @@ #define DEBUG_TYPE "ModuloSched" #include "MSSchedule.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include "llvm/Target/TargetSchedInfo.h" using namespace llvm; diff --git a/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp b/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp index 6bee44d934a..5bdcc9afcf2 100644 --- a/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp +++ b/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp @@ -16,7 +16,7 @@ #include "../../Target/SparcV9/SparcV9RegisterInfo.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/Target/TargetInstrInfo.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <cstdlib> using namespace llvm; diff --git a/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h b/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h index 0dcbb496f19..4ea572a380b 100644 --- a/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h +++ b/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h @@ -16,9 +16,9 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetMachine.h" -#include "Support/GraphTraits.h" -#include "Support/STLExtras.h" -#include "Support/iterator" +#include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/iterator" #include <vector> namespace llvm { diff --git a/llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp b/llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp index dadc38570c6..9ad1e4ce4bd 100644 --- a/llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp +++ b/llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp @@ -21,9 +21,9 @@ #include "llvm/CodeGen/Passes.h" #include "llvm/Support/CFG.h" #include "llvm/Target/TargetSchedInfo.h" -#include "Support/Debug.h" -#include "Support/GraphWriter.h" -#include "Support/StringExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/GraphWriter.h" +#include "llvm/ADT/StringExtras.h" #include <cmath> #include <fstream> #include <sstream> diff --git a/llvm/lib/CodeGen/PHIElimination.cpp b/llvm/lib/CodeGen/PHIElimination.cpp index 4df9a92bb45..0010ccd7e66 100644 --- a/llvm/lib/CodeGen/PHIElimination.cpp +++ b/llvm/lib/CodeGen/PHIElimination.cpp @@ -20,8 +20,8 @@ #include "llvm/CodeGen/LiveVariables.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/DenseMap.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/DenseMap.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; namespace { diff --git a/llvm/lib/CodeGen/Passes.cpp b/llvm/lib/CodeGen/Passes.cpp index 7233e81473b..4d2f111b2ed 100644 --- a/llvm/lib/CodeGen/Passes.cpp +++ b/llvm/lib/CodeGen/Passes.cpp @@ -13,7 +13,7 @@ //===---------------------------------------------------------------------===// #include "llvm/CodeGen/Passes.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <iostream> using namespace llvm; diff --git a/llvm/lib/CodeGen/RegAllocIterativeScan.cpp b/llvm/lib/CodeGen/RegAllocIterativeScan.cpp index ffeb68d9dda..26fa7b7655b 100644 --- a/llvm/lib/CodeGen/RegAllocIterativeScan.cpp +++ b/llvm/lib/CodeGen/RegAllocIterativeScan.cpp @@ -25,9 +25,9 @@ #include "llvm/CodeGen/SSARegMap.h" #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include "LiveIntervalAnalysis.h" #include "PhysRegTracker.h" #include "VirtRegMap.h" diff --git a/llvm/lib/CodeGen/RegAllocLinearScan.cpp b/llvm/lib/CodeGen/RegAllocLinearScan.cpp index 181f061986a..8736a236755 100644 --- a/llvm/lib/CodeGen/RegAllocLinearScan.cpp +++ b/llvm/lib/CodeGen/RegAllocLinearScan.cpp @@ -19,9 +19,9 @@ #include "llvm/CodeGen/SSARegMap.h" #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include "LiveIntervalAnalysis.h" #include "PhysRegTracker.h" #include "VirtRegMap.h" diff --git a/llvm/lib/CodeGen/RegAllocLocal.cpp b/llvm/lib/CodeGen/RegAllocLocal.cpp index 482325fbff7..2cf8e6327e4 100644 --- a/llvm/lib/CodeGen/RegAllocLocal.cpp +++ b/llvm/lib/CodeGen/RegAllocLocal.cpp @@ -21,10 +21,10 @@ #include "llvm/CodeGen/LiveVariables.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/DenseMap.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DenseMap.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/CodeGen/RegAllocSimple.cpp b/llvm/lib/CodeGen/RegAllocSimple.cpp index 6f6c2c6352e..ba05bd38309 100644 --- a/llvm/lib/CodeGen/RegAllocSimple.cpp +++ b/llvm/lib/CodeGen/RegAllocSimple.cpp @@ -22,9 +22,9 @@ #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; namespace { diff --git a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp index 0268d4b01a5..e3e79f01f5c 100644 --- a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp +++ b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp @@ -37,9 +37,9 @@ #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; namespace { diff --git a/llvm/lib/CodeGen/UnreachableBlockElim.cpp b/llvm/lib/CodeGen/UnreachableBlockElim.cpp index 27355ec6d3d..0bde9ff23a2 100644 --- a/llvm/lib/CodeGen/UnreachableBlockElim.cpp +++ b/llvm/lib/CodeGen/UnreachableBlockElim.cpp @@ -26,7 +26,7 @@ #include "llvm/Function.h" #include "llvm/Pass.h" #include "llvm/Support/CFG.h" -#include "Support/DepthFirstIterator.h" +#include "llvm/ADT/DepthFirstIterator.h" using namespace llvm; namespace { diff --git a/llvm/lib/CodeGen/VirtRegMap.cpp b/llvm/lib/CodeGen/VirtRegMap.cpp index c235aada9f4..cffe77c5180 100644 --- a/llvm/lib/CodeGen/VirtRegMap.cpp +++ b/llvm/lib/CodeGen/VirtRegMap.cpp @@ -22,11 +22,11 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetInstrInfo.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/DenseMap.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DenseMap.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; diff --git a/llvm/lib/CodeGen/VirtRegMap.h b/llvm/lib/CodeGen/VirtRegMap.h index c76a222341e..fb694d5e1a8 100644 --- a/llvm/lib/CodeGen/VirtRegMap.h +++ b/llvm/lib/CodeGen/VirtRegMap.h @@ -20,7 +20,7 @@ #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/SSARegMap.h" -#include "Support/DenseMap.h" +#include "llvm/ADT/DenseMap.h" #include <climits> #include <map> diff --git a/llvm/lib/Debugger/Debugger.cpp b/llvm/lib/Debugger/Debugger.cpp index 02c4a8a4916..76cdfa20148 100644 --- a/llvm/lib/Debugger/Debugger.cpp +++ b/llvm/lib/Debugger/Debugger.cpp @@ -16,7 +16,7 @@ #include "llvm/ModuleProvider.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Debugger/InferiorProcess.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" using namespace llvm; /// Debugger constructor - Initialize the debugger to its initial, empty, state. diff --git a/llvm/lib/Debugger/ProgramInfo.cpp b/llvm/lib/Debugger/ProgramInfo.cpp index 8bb8738c657..d6a4532b4f5 100644 --- a/llvm/lib/Debugger/ProgramInfo.cpp +++ b/llvm/lib/Debugger/ProgramInfo.cpp @@ -20,9 +20,9 @@ #include "llvm/Module.h" #include "llvm/Debugger/SourceFile.h" #include "llvm/Debugger/SourceLanguage.h" -#include "Support/FileUtilities.h" -#include "Support/SlowOperationInformer.h" -#include "Support/STLExtras.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/Support/SlowOperationInformer.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> using namespace llvm; diff --git a/llvm/lib/Debugger/SourceFile.cpp b/llvm/lib/Debugger/SourceFile.cpp index 2eb3b5750b1..f0bd0d8a221 100644 --- a/llvm/lib/Debugger/SourceFile.cpp +++ b/llvm/lib/Debugger/SourceFile.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #include "llvm/Debugger/SourceFile.h" -#include "Support/SlowOperationInformer.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/SlowOperationInformer.h" +#include "llvm/Support/FileUtilities.h" #include <iostream> #include <cerrno> #include <fcntl.h> diff --git a/llvm/lib/Debugger/UnixLocalInferiorProcess.cpp b/llvm/lib/Debugger/UnixLocalInferiorProcess.cpp index 1cacb534a27..437b21864ed 100644 --- a/llvm/lib/Debugger/UnixLocalInferiorProcess.cpp +++ b/llvm/lib/Debugger/UnixLocalInferiorProcess.cpp @@ -32,8 +32,8 @@ #include "llvm/CodeGen/IntrinsicLowering.h" #include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/ExecutionEngine/ExecutionEngine.h" -#include "Support/FileUtilities.h" -#include "Support/StringExtras.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/ADT/StringExtras.h" #include <cerrno> #include <csignal> #include <unistd.h> // Unix-specific debugger support diff --git a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp index 105c0b8a1d9..b239cc2a53e 100644 --- a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp +++ b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp @@ -23,9 +23,9 @@ #include "llvm/ExecutionEngine/ExecutionEngine.h" #include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/Target/TargetData.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/DynamicLinker.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/DynamicLinker.h" using namespace llvm; namespace { diff --git a/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp b/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp index 705fc16db8e..5e1ae0629f8 100644 --- a/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -18,8 +18,8 @@ #include "llvm/Instructions.h" #include "llvm/CodeGen/IntrinsicLowering.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "Support/Statistic.h" -#include "Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/Debug.h" #include <cmath> // For fmod using namespace llvm; diff --git a/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp index 83da7551b0a..def406a4b70 100644 --- a/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp +++ b/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp @@ -23,7 +23,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/Target/TargetData.h" -#include "Support/DynamicLinker.h" +#include "llvm/Support/DynamicLinker.h" #include <cmath> #include <csignal> #include <map> diff --git a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h index 99e417c4a84..d6e590d7357 100644 --- a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h +++ b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h @@ -20,7 +20,7 @@ #include "llvm/Support/InstVisitor.h" #include "llvm/Support/CallSite.h" #include "llvm/Target/TargetData.h" -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include <iostream> namespace llvm { diff --git a/llvm/lib/ExecutionEngine/JIT/Emitter.cpp b/llvm/lib/ExecutionEngine/JIT/Emitter.cpp index 7065c56a466..5758ebc432a 100644 --- a/llvm/lib/ExecutionEngine/JIT/Emitter.cpp +++ b/llvm/lib/ExecutionEngine/JIT/Emitter.cpp @@ -20,9 +20,9 @@ #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/Target/TargetData.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/SystemUtils.h" using namespace llvm; namespace { diff --git a/llvm/lib/ExecutionEngine/JIT/Intercept.cpp b/llvm/lib/ExecutionEngine/JIT/Intercept.cpp index 8ed94471596..2eafb75cd0e 100644 --- a/llvm/lib/ExecutionEngine/JIT/Intercept.cpp +++ b/llvm/lib/ExecutionEngine/JIT/Intercept.cpp @@ -16,7 +16,7 @@ //===----------------------------------------------------------------------===// #include "JIT.h" -#include "Support/DynamicLinker.h" +#include "llvm/Support/DynamicLinker.h" #include <iostream> #include <sys/stat.h> using namespace llvm; diff --git a/llvm/lib/ExecutionEngine/JIT/JIT.cpp b/llvm/lib/ExecutionEngine/JIT/JIT.cpp index 675ef479d11..311ec4b47db 100644 --- a/llvm/lib/ExecutionEngine/JIT/JIT.cpp +++ b/llvm/lib/ExecutionEngine/JIT/JIT.cpp @@ -24,7 +24,7 @@ #include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetJITInfo.h" -#include "Support/DynamicLinker.h" +#include "llvm/Support/DynamicLinker.h" #include <iostream> using namespace llvm; diff --git a/llvm/lib/Support/Annotation.cpp b/llvm/lib/Support/Annotation.cpp index 45fd06f92e2..c8cf8298b40 100644 --- a/llvm/lib/Support/Annotation.cpp +++ b/llvm/lib/Support/Annotation.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include <map> -#include "Support/Annotation.h" +#include "llvm/Support/Annotation.h" using namespace llvm; Annotation::~Annotation() {} // Designed to be subclassed diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp index 3bc9cbf1ca8..d60b464dd5a 100644 --- a/llvm/lib/Support/CommandLine.cpp +++ b/llvm/lib/Support/CommandLine.cpp @@ -16,8 +16,8 @@ // //===----------------------------------------------------------------------===// -#include "Config/config.h" -#include "Support/CommandLine.h" +#include "llvm/Config/config.h" +#include "llvm/Support/CommandLine.h" #include <algorithm> #include <map> #include <set> diff --git a/llvm/lib/Support/Debug.cpp b/llvm/lib/Support/Debug.cpp index f1713429497..a58716763a7 100644 --- a/llvm/lib/Support/Debug.cpp +++ b/llvm/lib/Support/Debug.cpp @@ -23,8 +23,8 @@ // //===----------------------------------------------------------------------===// -#include "Support/Debug.h" -#include "Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; bool llvm::DebugFlag; // DebugFlag - Exported boolean set by the -debug option diff --git a/llvm/lib/Support/DynamicLinker.cpp b/llvm/lib/Support/DynamicLinker.cpp index 4ac58c1bbc0..a6593034c7e 100644 --- a/llvm/lib/Support/DynamicLinker.cpp +++ b/llvm/lib/Support/DynamicLinker.cpp @@ -18,9 +18,9 @@ // //===----------------------------------------------------------------------===// -#include "Support/DynamicLinker.h" -#include "Config/dlfcn.h" -#include "Config/windows.h" +#include "llvm/Support/DynamicLinker.h" +#include "llvm/Config/dlfcn.h" +#include "llvm/Config/windows.h" #include <cassert> #include <vector> using namespace llvm; diff --git a/llvm/lib/Support/FileUtilities.cpp b/llvm/lib/Support/FileUtilities.cpp index 09542c3fabb..6829f155b8e 100644 --- a/llvm/lib/Support/FileUtilities.cpp +++ b/llvm/lib/Support/FileUtilities.cpp @@ -12,14 +12,14 @@ // //===----------------------------------------------------------------------===// -#include "Support/FileUtilities.h" -#include "Support/DataTypes.h" -#include "Config/unistd.h" -#include "Config/fcntl.h" -#include "Config/sys/types.h" -#include "Config/sys/stat.h" -#include "Config/sys/mman.h" -#include "Config/alloca.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/Support/DataTypes.h" +#include "llvm/Config/unistd.h" +#include "llvm/Config/fcntl.h" +#include "llvm/Config/sys/types.h" +#include "llvm/Config/sys/stat.h" +#include "llvm/Config/sys/mman.h" +#include "llvm/Config/alloca.h" #include <cerrno> #include <cstdio> #include <fstream> diff --git a/llvm/lib/Support/IsInf.cpp b/llvm/lib/Support/IsInf.cpp index 7fd857e931b..c50eadff179 100644 --- a/llvm/lib/Support/IsInf.cpp +++ b/llvm/lib/Support/IsInf.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "Config/config.h" +#include "llvm/Config/config.h" #if HAVE_ISINF_IN_MATH_H # include <math.h> #elif HAVE_ISINF_IN_CMATH diff --git a/llvm/lib/Support/IsNAN.cpp b/llvm/lib/Support/IsNAN.cpp index ade6bf1dc86..75c813f41aa 100644 --- a/llvm/lib/Support/IsNAN.cpp +++ b/llvm/lib/Support/IsNAN.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "Config/config.h" +#include "llvm/Config/config.h" #if HAVE_ISNAN_IN_MATH_H # include <math.h> #elif HAVE_ISNAN_IN_CMATH diff --git a/llvm/lib/Support/PluginLoader.cpp b/llvm/lib/Support/PluginLoader.cpp index cbec6fa7d4d..2c13d578129 100644 --- a/llvm/lib/Support/PluginLoader.cpp +++ b/llvm/lib/Support/PluginLoader.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #define DONT_GET_PLUGIN_LOADER_OPTION -#include "Support/PluginLoader.h" -#include "Support/DynamicLinker.h" +#include "llvm/Support/PluginLoader.h" +#include "llvm/Support/DynamicLinker.h" #include <iostream> using namespace llvm; diff --git a/llvm/lib/Support/SlowOperationInformer.cpp b/llvm/lib/Support/SlowOperationInformer.cpp index c245f3655c2..43faaadaae1 100644 --- a/llvm/lib/Support/SlowOperationInformer.cpp +++ b/llvm/lib/Support/SlowOperationInformer.cpp @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// -#include "Support/SlowOperationInformer.h" -#include "Config/config.h" // Get the signal handler return type +#include "llvm/Support/SlowOperationInformer.h" +#include "llvm/Config/config.h" // Get the signal handler return type #include <iostream> #include <sstream> #include <signal.h> diff --git a/llvm/lib/Support/Statistic.cpp b/llvm/lib/Support/Statistic.cpp index 7fa7547fee3..f4d9c7b9e24 100644 --- a/llvm/lib/Support/Statistic.cpp +++ b/llvm/lib/Support/Statistic.cpp @@ -21,8 +21,8 @@ // //===----------------------------------------------------------------------===// -#include "Support/Statistic.h" -#include "Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/CommandLine.h" #include <sstream> #include <iostream> #include <algorithm> diff --git a/llvm/lib/Support/StringExtras.cpp b/llvm/lib/Support/StringExtras.cpp index 011ce280f05..e8d423a74da 100644 --- a/llvm/lib/Support/StringExtras.cpp +++ b/llvm/lib/Support/StringExtras.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" using namespace llvm; /// getToken - This function extracts one token from source, ignoring any diff --git a/llvm/lib/Support/SystemUtils.cpp b/llvm/lib/Support/SystemUtils.cpp index b831f4096d0..3b529df79c7 100644 --- a/llvm/lib/Support/SystemUtils.cpp +++ b/llvm/lib/Support/SystemUtils.cpp @@ -13,15 +13,15 @@ //===----------------------------------------------------------------------===// #define _POSIX_MAPPED_FILES -#include "Support/SystemUtils.h" -#include "Config/fcntl.h" -#include "Config/pagesize.h" -#include "Config/unistd.h" -#include "Config/windows.h" -#include "Config/sys/mman.h" -#include "Config/sys/stat.h" -#include "Config/sys/types.h" -#include "Config/sys/wait.h" +#include "llvm/Support/SystemUtils.h" +#include "llvm/Config/fcntl.h" +#include "llvm/Config/pagesize.h" +#include "llvm/Config/unistd.h" +#include "llvm/Config/windows.h" +#include "llvm/Config/sys/mman.h" +#include "llvm/Config/sys/stat.h" +#include "llvm/Config/sys/types.h" +#include "llvm/Config/sys/wait.h" #include <algorithm> #include <cerrno> #include <cstdlib> diff --git a/llvm/lib/Support/Timer.cpp b/llvm/lib/Support/Timer.cpp index 52b616fa2c4..ff3fd6fefe0 100644 --- a/llvm/lib/Support/Timer.cpp +++ b/llvm/lib/Support/Timer.cpp @@ -11,18 +11,18 @@ // //===----------------------------------------------------------------------===// -#include "Support/Timer.h" -#include "Support/CommandLine.h" +#include "llvm/Support/Timer.h" +#include "llvm/Support/CommandLine.h" #include <algorithm> #include <iostream> #include <functional> #include <fstream> #include <map> -#include "Config/sys/resource.h" -#include "Config/sys/time.h" -#include "Config/unistd.h" -#include "Config/malloc.h" -#include "Config/windows.h" +#include "llvm/Config/sys/resource.h" +#include "llvm/Config/sys/time.h" +#include "llvm/Config/unistd.h" +#include "llvm/Config/malloc.h" +#include "llvm/Config/windows.h" using namespace llvm; // GetLibSupportInfoOutputFile - Return a file stream to print our output on. diff --git a/llvm/lib/Support/ToolRunner.cpp b/llvm/lib/Support/ToolRunner.cpp index b694127e076..3dc98451de5 100644 --- a/llvm/lib/Support/ToolRunner.cpp +++ b/llvm/lib/Support/ToolRunner.cpp @@ -13,9 +13,9 @@ #define DEBUG_TYPE "toolrunner" #include "llvm/Support/ToolRunner.h" -#include "Config/config.h" // for HAVE_LINK_R -#include "Support/Debug.h" -#include "Support/FileUtilities.h" +#include "llvm/Config/config.h" // for HAVE_LINK_R +#include "llvm/Support/Debug.h" +#include "llvm/Support/FileUtilities.h" #include <fstream> #include <sstream> using namespace llvm; diff --git a/llvm/lib/System/Unix/Path.cpp b/llvm/lib/System/Unix/Path.cpp index 9a860a0672f..49b2bf4afe1 100644 --- a/llvm/lib/System/Unix/Path.cpp +++ b/llvm/lib/System/Unix/Path.cpp @@ -16,10 +16,10 @@ //=== is guaranteed to work on *all* UNIX variants. //===----------------------------------------------------------------------===// +#include <llvm/Config/config.h> #include "Unix.h" #include <sys/stat.h> #include <fcntl.h> -#include <Config/config.h> namespace llvm { using namespace sys; diff --git a/llvm/lib/System/Unix/Program.cpp b/llvm/lib/System/Unix/Program.cpp index ca8514dfa69..b8ef55925d6 100644 --- a/llvm/lib/System/Unix/Program.cpp +++ b/llvm/lib/System/Unix/Program.cpp @@ -16,10 +16,10 @@ //=== is guaranteed to work on *all* UNIX variants. //===----------------------------------------------------------------------===// +#include <llvm/Config/config.h> #include "Unix.h" #include <sys/stat.h> #include <fcntl.h> -#include <Config/config.h> #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif diff --git a/llvm/lib/System/Unix/Unix.h b/llvm/lib/System/Unix/Unix.h index aa6bfb1a78a..b9eff46c46f 100644 --- a/llvm/lib/System/Unix/Unix.h +++ b/llvm/lib/System/Unix/Unix.h @@ -16,7 +16,7 @@ //=== is guaranteed to work on all UNIX variants. //===----------------------------------------------------------------------===// -#include "Config/config.h" // Get autoconf configuration settings +#include "llvm/Config/config.h" // Get autoconf configuration settings #include <unistd.h> #include <cstdlib> #include <cstdio> diff --git a/llvm/lib/Target/CBackend/Writer.cpp b/llvm/lib/Target/CBackend/Writer.cpp index b8208d4a4c7..45a771f9dfe 100644 --- a/llvm/lib/Target/CBackend/Writer.cpp +++ b/llvm/lib/Target/CBackend/Writer.cpp @@ -32,9 +32,9 @@ #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Support/Mangler.h" -#include "Support/StringExtras.h" -#include "Support/MathExtras.h" -#include "Config/config.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/Support/MathExtras.h" +#include "llvm/Config/config.h" #include <algorithm> #include <iostream> #include <sstream> diff --git a/llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp index 2358f1608a0..b30977b1a19 100644 --- a/llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp +++ b/llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp @@ -29,10 +29,10 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/ValueTypes.h" #include "llvm/Support/Mangler.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp b/llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp index b8eb6b67142..b08ce92d99f 100644 --- a/llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp +++ b/llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp @@ -15,7 +15,7 @@ #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/Passes.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" namespace llvm { diff --git a/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp b/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp index 923e8d57bc0..5ba7a5beeb2 100644 --- a/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp +++ b/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp @@ -26,8 +26,8 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <vector> using namespace llvm; diff --git a/llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp b/llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp index bebb8688418..321a44939b6 100644 --- a/llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp +++ b/llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp @@ -24,9 +24,9 @@ #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/STLExtras.h" #include <cstdlib> #include <iostream> using namespace llvm; diff --git a/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp index 74aaad5b154..972fa01bb91 100644 --- a/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp +++ b/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp @@ -25,11 +25,11 @@ #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Support/Mangler.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/MathExtras.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/MathExtras.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" #include <set> namespace llvm { diff --git a/llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp b/llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp index 637e8565b25..107266ed62e 100644 --- a/llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp +++ b/llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp @@ -26,8 +26,8 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <vector> using namespace llvm; diff --git a/llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp b/llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp index 774e661e62f..1871c2e3152 100644 --- a/llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp +++ b/llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp @@ -24,9 +24,9 @@ #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/STLExtras.h" #include <cstdlib> #include <iostream> using namespace llvm; diff --git a/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp b/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp index e2456c9320d..6f7b597da3a 100644 --- a/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp +++ b/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp @@ -22,7 +22,7 @@ #include "PPC32InstrInfo.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineFunction.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <map> using namespace llvm; diff --git a/llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp b/llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp index fa2455cc873..f9f1cb4a531 100644 --- a/llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp +++ b/llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp @@ -25,7 +25,7 @@ #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetMachineRegistry.h" #include "llvm/Transforms/Scalar.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <iostream> using namespace llvm; diff --git a/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp b/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp index 09f59542696..785054c9f27 100644 --- a/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp +++ b/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp @@ -16,7 +16,7 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/Support/CFG.h" -#include "Support/SetOperations.h" +#include "llvm/ADT/SetOperations.h" #include "../SparcV9Internals.h" #include <iostream> diff --git a/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h b/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h index 7e5c72e3e46..e8486acf078 100644 --- a/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h +++ b/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h @@ -16,7 +16,7 @@ #define LIVE_VAR_BB_H #include "llvm/CodeGen/ValueSet.h" -#include "Support/hash_map" +#include "llvm/ADT/hash_map" namespace llvm { diff --git a/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp b/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp index 4a8ada91238..2883bf1c092 100644 --- a/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp +++ b/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp @@ -18,9 +18,9 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Support/CFG.h" -#include "Support/PostOrderIterator.h" -#include "Support/SetOperations.h" -#include "Support/CommandLine.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/SetOperations.h" +#include "llvm/Support/CommandLine.h" #include "BBLiveVar.h" #include <iostream> diff --git a/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h b/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h index 23a9d93a6eb..02d5c0531bb 100644 --- a/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h +++ b/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h @@ -35,7 +35,7 @@ #ifndef FUNCTION_LIVE_VAR_INFO_H #define FUNCTION_LIVE_VAR_INFO_H -#include "Support/hash_map" +#include "llvm/ADT/hash_map" #include "llvm/Pass.h" #include "llvm/CodeGen/ValueSet.h" diff --git a/llvm/lib/Target/SparcV9/MachineFunctionInfo.h b/llvm/lib/Target/SparcV9/MachineFunctionInfo.h index 70bbccded58..3596bc2fa1b 100644 --- a/llvm/lib/Target/SparcV9/MachineFunctionInfo.h +++ b/llvm/lib/Target/SparcV9/MachineFunctionInfo.h @@ -20,8 +20,8 @@ #include "MachineCodeForInstruction.h" #include "llvm/CodeGen/MachineFunction.h" -#include "Support/HashExtras.h" -#include "Support/hash_set" +#include "llvm/ADT/HashExtras.h" +#include "llvm/ADT/hash_set" namespace llvm { diff --git a/llvm/lib/Target/SparcV9/MappingInfo.cpp b/llvm/lib/Target/SparcV9/MappingInfo.cpp index e8c7581ed7b..1a7212c9c09 100644 --- a/llvm/lib/Target/SparcV9/MappingInfo.cpp +++ b/llvm/lib/Target/SparcV9/MappingInfo.cpp @@ -47,7 +47,7 @@ #include "llvm/Module.h" #include "llvm/CodeGen/MachineFunction.h" #include "MachineCodeForInstruction.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" namespace llvm { diff --git a/llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp b/llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp index 9344e63f693..3f57eccd89c 100644 --- a/llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp +++ b/llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp @@ -14,7 +14,7 @@ #include "IGNode.h" #include "InterferenceGraph.h" #include "RegAllocCommon.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <iostream> diff --git a/llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h b/llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h index 7a37596af00..503eddac7f6 100644 --- a/llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h +++ b/llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h @@ -16,7 +16,7 @@ #define LIVERANGE_H #include "llvm/Value.h" -#include "Support/SetVector.h" +#include "llvm/ADT/SetVector.h" #include <iostream> namespace llvm { diff --git a/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp b/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp index b2b49d54652..190e0c57af6 100644 --- a/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp +++ b/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp @@ -21,7 +21,7 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetInstrInfo.h" #include "../SparcV9RegInfo.h" -#include "Support/SetOperations.h" +#include "llvm/ADT/SetOperations.h" #include <iostream> namespace llvm { diff --git a/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h b/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h index 89a169ea933..a6569146057 100644 --- a/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h +++ b/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h @@ -27,7 +27,7 @@ #define LIVERANGEINFO_H #include "llvm/CodeGen/ValueSet.h" -#include "Support/hash_map" +#include "llvm/ADT/hash_map" namespace llvm { diff --git a/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp index bbbaee8822c..6a1710ef544 100644 --- a/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp +++ b/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp @@ -43,9 +43,9 @@ #include "llvm/CodeGen/Passes.h" #include "llvm/Support/InstIterator.h" #include "llvm/Target/TargetInstrInfo.h" -#include "Support/CommandLine.h" -#include "Support/SetOperations.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/SetOperations.h" +#include "llvm/ADT/STLExtras.h" #include <cmath> #include <iostream> diff --git a/llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp b/llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp index 36deae09d82..dbfc1e1e0ca 100644 --- a/llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp +++ b/llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp @@ -28,8 +28,8 @@ #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Support/Mangler.h" -#include "Support/StringExtras.h" -#include "Support/Statistic.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/Statistic.h" #include "SparcV9Internals.h" #include "MachineFunctionInfo.h" #include <string> diff --git a/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp b/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp index 0b4685c3a47..1d4dbbd2bf7 100644 --- a/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp +++ b/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp @@ -37,12 +37,12 @@ #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Type.h" -#include "Config/alloca.h" -#include "Support/CommandLine.h" -#include "Support/LeakDetector.h" -#include "Support/MathExtras.h" -#include "Support/STLExtras.h" -#include "Support/hash_map" +#include "llvm/Config/alloca.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/LeakDetector.h" +#include "llvm/Support/MathExtras.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/hash_map" #include <algorithm> #include <cmath> #include <iostream> diff --git a/llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp b/llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp index e870a15e86a..b46d07eb7b0 100644 --- a/llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp +++ b/llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp @@ -30,15 +30,15 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetData.h" -#include "Support/Debug.h" -#include "Support/hash_set" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/hash_set" +#include "llvm/ADT/Statistic.h" #include "SparcV9Internals.h" #include "SparcV9TargetMachine.h" #include "SparcV9RegInfo.h" #include "SparcV9CodeEmitter.h" #include "MachineFunctionInfo.h" -#include "Config/alloca.h" +#include "llvm/Config/alloca.h" namespace llvm { diff --git a/llvm/lib/Target/SparcV9/SparcV9Internals.h b/llvm/lib/Target/SparcV9/SparcV9Internals.h index 3ac696401fc..187d984a47e 100644 --- a/llvm/lib/Target/SparcV9/SparcV9Internals.h +++ b/llvm/lib/Target/SparcV9/SparcV9Internals.h @@ -22,7 +22,7 @@ #include "SparcV9RegInfo.h" #include "llvm/Type.h" #include "SparcV9RegClassInfo.h" -#include "Config/sys/types.h" +#include "llvm/Config/sys/types.h" namespace llvm { diff --git a/llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp b/llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp index 0b7baabb8d3..778ced25321 100644 --- a/llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp +++ b/llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp @@ -19,7 +19,7 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" namespace llvm { diff --git a/llvm/lib/Target/SparcV9/SparcV9RegInfo.h b/llvm/lib/Target/SparcV9/SparcV9RegInfo.h index 6f0ef04ae34..25a09616d0c 100644 --- a/llvm/lib/Target/SparcV9/SparcV9RegInfo.h +++ b/llvm/lib/Target/SparcV9/SparcV9RegInfo.h @@ -15,7 +15,7 @@ #ifndef SPARCV9REGINFO_H #define SPARCV9REGINFO_H -#include "Support/hash_map" +#include "llvm/ADT/hash_map" #include <string> #include <cassert> diff --git a/llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp b/llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp index 29a208c68c1..1019c5619f5 100644 --- a/llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp +++ b/llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp @@ -29,7 +29,7 @@ #include "SparcV9Internals.h" #include "SparcV9TargetMachine.h" #include "SparcV9BurgISel.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; static const unsigned ImplicitRegUseList[] = { 0 }; /* not used yet */ diff --git a/llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp b/llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp index 605cf061898..6e53cbc3c30 100644 --- a/llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp +++ b/llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "SparcV9TmpInstr.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" namespace llvm { diff --git a/llvm/lib/Target/TargetData.cpp b/llvm/lib/Target/TargetData.cpp index 22dde60d8f6..a57d6ba2fba 100644 --- a/llvm/lib/Target/TargetData.cpp +++ b/llvm/lib/Target/TargetData.cpp @@ -21,7 +21,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Constants.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "Support/MathExtras.h" +#include "llvm/Support/MathExtras.h" using namespace llvm; // Handle the Pass registration stuff necessary to use TargetData's. diff --git a/llvm/lib/Target/TargetMachine.cpp b/llvm/lib/Target/TargetMachine.cpp index ee8ef2e5ed6..973165f186e 100644 --- a/llvm/lib/Target/TargetMachine.cpp +++ b/llvm/lib/Target/TargetMachine.cpp @@ -14,7 +14,7 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Type.h" #include "llvm/CodeGen/IntrinsicLowering.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; //--------------------------------------------------------------------------- diff --git a/llvm/lib/Target/X86/X86AsmPrinter.cpp b/llvm/lib/Target/X86/X86AsmPrinter.cpp index a0f046b62f8..915ac3afd24 100644 --- a/llvm/lib/Target/X86/X86AsmPrinter.cpp +++ b/llvm/lib/Target/X86/X86AsmPrinter.cpp @@ -29,9 +29,9 @@ #include "llvm/CodeGen/ValueTypes.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Support/Mangler.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" -#include "Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; namespace { diff --git a/llvm/lib/Target/X86/X86CodeEmitter.cpp b/llvm/lib/Target/X86/X86CodeEmitter.cpp index 98e3bb4912a..69ab9ca928e 100644 --- a/llvm/lib/Target/X86/X86CodeEmitter.cpp +++ b/llvm/lib/Target/X86/X86CodeEmitter.cpp @@ -21,9 +21,9 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/Passes.h" #include "llvm/Function.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Config/alloca.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Config/alloca.h" using namespace llvm; namespace { diff --git a/llvm/lib/Target/X86/X86FloatingPoint.cpp b/llvm/lib/Target/X86/X86FloatingPoint.cpp index 8d7a8e72cc1..30763f0b986 100644 --- a/llvm/lib/Target/X86/X86FloatingPoint.cpp +++ b/llvm/lib/Target/X86/X86FloatingPoint.cpp @@ -37,10 +37,10 @@ #include "llvm/CodeGen/Passes.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Debug.h" -#include "Support/DepthFirstIterator.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <set> using namespace llvm; diff --git a/llvm/lib/Target/X86/X86ISelSimple.cpp b/llvm/lib/Target/X86/X86ISelSimple.cpp index 19c61080db6..e9dbc4b314a 100644 --- a/llvm/lib/Target/X86/X86ISelSimple.cpp +++ b/llvm/lib/Target/X86/X86ISelSimple.cpp @@ -28,7 +28,7 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Target/X86/X86PeepholeOpt.cpp b/llvm/lib/Target/X86/X86PeepholeOpt.cpp index 82c622bff13..f03e339d2a6 100644 --- a/llvm/lib/Target/X86/X86PeepholeOpt.cpp +++ b/llvm/lib/Target/X86/X86PeepholeOpt.cpp @@ -17,8 +17,8 @@ #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp index bac6138f03a..d78110eb8f2 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.cpp +++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp @@ -24,8 +24,8 @@ #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" -#include "Support/CommandLine.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> using namespace llvm; diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp index 1a9e978dc4a..06cbc49abf3 100644 --- a/llvm/lib/Target/X86/X86TargetMachine.cpp +++ b/llvm/lib/Target/X86/X86TargetMachine.cpp @@ -21,8 +21,8 @@ #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetMachineRegistry.h" #include "llvm/Transforms/Scalar.h" -#include "Support/CommandLine.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; X86VectorEnum llvm::X86Vector = NoSSE; diff --git a/llvm/lib/Transforms/ExprTypeConvert.cpp b/llvm/lib/Transforms/ExprTypeConvert.cpp index a657f023df4..779e23c1992 100644 --- a/llvm/lib/Transforms/ExprTypeConvert.cpp +++ b/llvm/lib/Transforms/ExprTypeConvert.cpp @@ -17,8 +17,8 @@ #include "llvm/Constants.h" #include "llvm/Instructions.h" #include "llvm/Analysis/Expressions.h" -#include "Support/STLExtras.h" -#include "Support/Debug.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/Support/Debug.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp index fe945c408d6..a4086524e17 100644 --- a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp +++ b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp @@ -39,10 +39,10 @@ #include "llvm/Target/TargetData.h" #include "llvm/Support/CallSite.h" #include "llvm/Support/CFG.h" -#include "Support/Debug.h" -#include "Support/DepthFirstIterator.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/IPO/ConstantMerge.cpp b/llvm/lib/Transforms/IPO/ConstantMerge.cpp index 417cb1de4bb..9f3c10959cc 100644 --- a/llvm/lib/Transforms/IPO/ConstantMerge.cpp +++ b/llvm/lib/Transforms/IPO/ConstantMerge.cpp @@ -20,7 +20,7 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Module.h" #include "llvm/Pass.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp b/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp index 836e0b60912..cde186c38d8 100644 --- a/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp +++ b/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp @@ -24,9 +24,9 @@ #include "llvm/Constant.h" #include "llvm/Instructions.h" #include "llvm/Support/CallSite.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/iterator" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/iterator" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp b/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp index cad90f56729..e2d475daf9f 100644 --- a/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp +++ b/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp @@ -17,7 +17,7 @@ #include "llvm/Module.h" #include "llvm/SymbolTable.h" #include "llvm/DerivedTypes.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/IPO/FunctionResolution.cpp b/llvm/lib/Transforms/IPO/FunctionResolution.cpp index 8403226ba38..006d33cf519 100644 --- a/llvm/lib/Transforms/IPO/FunctionResolution.cpp +++ b/llvm/lib/Transforms/IPO/FunctionResolution.cpp @@ -27,7 +27,7 @@ #include "llvm/Support/CallSite.h" #include "llvm/Target/TargetData.h" #include "llvm/Assembly/Writer.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/Transforms/IPO/GlobalConstifier.cpp b/llvm/lib/Transforms/IPO/GlobalConstifier.cpp index f9be0ad2460..dd9894cd19f 100644 --- a/llvm/lib/Transforms/IPO/GlobalConstifier.cpp +++ b/llvm/lib/Transforms/IPO/GlobalConstifier.cpp @@ -23,8 +23,8 @@ #include "llvm/Instructions.h" #include "llvm/Module.h" #include "llvm/Pass.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/IPO/GlobalDCE.cpp b/llvm/lib/Transforms/IPO/GlobalDCE.cpp index e025813fd07..ea5201cd232 100644 --- a/llvm/lib/Transforms/IPO/GlobalDCE.cpp +++ b/llvm/lib/Transforms/IPO/GlobalDCE.cpp @@ -19,7 +19,7 @@ #include "llvm/Constants.h" #include "llvm/Module.h" #include "llvm/Pass.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp b/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp index 36ac2023c1d..74a0a9b699e 100644 --- a/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp +++ b/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp @@ -20,7 +20,7 @@ #include "llvm/Pass.h" #include "llvm/Constants.h" #include "llvm/Support/CallSite.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/IPO/Inliner.cpp b/llvm/lib/Transforms/IPO/Inliner.cpp index f0cb03d7b17..86d343af6a0 100644 --- a/llvm/lib/Transforms/IPO/Inliner.cpp +++ b/llvm/lib/Transforms/IPO/Inliner.cpp @@ -19,9 +19,9 @@ #include "llvm/Analysis/CallGraph.h" #include "llvm/Support/CallSite.h" #include "llvm/Transforms/Utils/Cloning.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/IPO/Internalize.cpp b/llvm/lib/Transforms/IPO/Internalize.cpp index 15c68cd893b..c6b75b1be92 100644 --- a/llvm/lib/Transforms/IPO/Internalize.cpp +++ b/llvm/lib/Transforms/IPO/Internalize.cpp @@ -16,9 +16,9 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Pass.h" #include "llvm/Module.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <fstream> #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/IPO/LoopExtractor.cpp b/llvm/lib/Transforms/IPO/LoopExtractor.cpp index a36c99632e6..e1ce290526c 100644 --- a/llvm/lib/Transforms/IPO/LoopExtractor.cpp +++ b/llvm/lib/Transforms/IPO/LoopExtractor.cpp @@ -22,7 +22,7 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Utils/FunctionUtils.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/IPO/LowerSetJmp.cpp b/llvm/lib/Transforms/IPO/LowerSetJmp.cpp index f5c36d99ae4..ebd0500cba5 100644 --- a/llvm/lib/Transforms/IPO/LowerSetJmp.cpp +++ b/llvm/lib/Transforms/IPO/LowerSetJmp.cpp @@ -43,10 +43,10 @@ #include "llvm/Support/CFG.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/DepthFirstIterator.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" -#include "Support/VectorExtras.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/VectorExtras.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/IPO/PruneEH.cpp b/llvm/lib/Transforms/IPO/PruneEH.cpp index fbb16594882..43b9acff731 100644 --- a/llvm/lib/Transforms/IPO/PruneEH.cpp +++ b/llvm/lib/Transforms/IPO/PruneEH.cpp @@ -20,7 +20,7 @@ #include "llvm/Intrinsics.h" #include "llvm/Instructions.h" #include "llvm/Analysis/CallGraph.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/IPO/RaiseAllocations.cpp b/llvm/lib/Transforms/IPO/RaiseAllocations.cpp index 36aef9c8eb6..42edb7e05de 100644 --- a/llvm/lib/Transforms/IPO/RaiseAllocations.cpp +++ b/llvm/lib/Transforms/IPO/RaiseAllocations.cpp @@ -19,7 +19,7 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Support/CallSite.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp b/llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp index c60636cfb57..28830afba82 100644 --- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp +++ b/llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp @@ -14,7 +14,7 @@ #include "Graph.h" #include "llvm/Instructions.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <algorithm> using std::vector; diff --git a/llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp b/llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp index 4e8419d9656..10ef440b4f8 100644 --- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp +++ b/llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp @@ -15,7 +15,7 @@ #include "llvm/Pass.h" #include "llvm/Module.h" #include "llvm/Instructions.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <algorithm> #include "Graph.h" diff --git a/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp b/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp index 96d23f2253e..56a20730b78 100644 --- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp +++ b/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp @@ -20,7 +20,7 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Type.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include "../ProfilingUtils.h" namespace llvm { diff --git a/llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp b/llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp index 3953c28e52b..60426c4e5af 100644 --- a/llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp +++ b/llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp @@ -20,7 +20,7 @@ #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Instructions.h" #include "ProfilingUtils.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/Instrumentation/TraceValues.cpp b/llvm/lib/Transforms/Instrumentation/TraceValues.cpp index ae356a2f73d..1247dfcfbb5 100644 --- a/llvm/lib/Transforms/Instrumentation/TraceValues.cpp +++ b/llvm/lib/Transforms/Instrumentation/TraceValues.cpp @@ -19,8 +19,8 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Assembly/Writer.h" -#include "Support/CommandLine.h" -#include "Support/StringExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <sstream> using namespace llvm; diff --git a/llvm/lib/Transforms/LevelRaise.cpp b/llvm/lib/Transforms/LevelRaise.cpp index f470e504610..cc4e69d9acd 100644 --- a/llvm/lib/Transforms/LevelRaise.cpp +++ b/llvm/lib/Transforms/LevelRaise.cpp @@ -19,10 +19,10 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/ADCE.cpp b/llvm/lib/Transforms/Scalar/ADCE.cpp index 04a64172726..5770bb692c2 100644 --- a/llvm/lib/Transforms/Scalar/ADCE.cpp +++ b/llvm/lib/Transforms/Scalar/ADCE.cpp @@ -23,10 +23,10 @@ #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Utils/Local.h" #include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h" -#include "Support/Debug.h" -#include "Support/DepthFirstIterator.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp b/llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp index a25ab0f1215..cadc6201708 100644 --- a/llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp +++ b/llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp @@ -30,7 +30,7 @@ #include "llvm/Function.h" #include "llvm/Pass.h" #include "llvm/Support/CFG.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/ConstantProp.cpp b/llvm/lib/Transforms/Scalar/ConstantProp.cpp index 8be02476b9c..2985ceba638 100644 --- a/llvm/lib/Transforms/Scalar/ConstantProp.cpp +++ b/llvm/lib/Transforms/Scalar/ConstantProp.cpp @@ -24,7 +24,7 @@ #include "llvm/Instruction.h" #include "llvm/Pass.h" #include "llvm/Support/InstIterator.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp b/llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp index 9738879e282..53c56d2631a 100644 --- a/llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp +++ b/llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp @@ -38,9 +38,9 @@ #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Support/ConstantRange.h" #include "llvm/Support/CFG.h" -#include "Support/Debug.h" -#include "Support/PostOrderIterator.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/Statistic.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/DCE.cpp b/llvm/lib/Transforms/Scalar/DCE.cpp index 570a5252d5a..1a523cde461 100644 --- a/llvm/lib/Transforms/Scalar/DCE.cpp +++ b/llvm/lib/Transforms/Scalar/DCE.cpp @@ -21,7 +21,7 @@ #include "llvm/Instruction.h" #include "llvm/Pass.h" #include "llvm/Support/InstIterator.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp b/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp index 40b5671e4c6..82dfebb5943 100644 --- a/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp +++ b/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp @@ -22,8 +22,8 @@ #include "llvm/Analysis/AliasSetTracker.h" #include "llvm/Target/TargetData.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/SetVector.h" -#include "Support/Statistic.h" +#include "llvm/ADT/SetVector.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp b/llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp index b1f8f2a01ab..40e1be5d461 100644 --- a/llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp +++ b/llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp @@ -22,8 +22,8 @@ #include "llvm/Instructions.h" #include "llvm/BasicBlock.h" #include "llvm/Pass.h" -#include "Support/Statistic.h" -#include "Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/Debug.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/GCSE.cpp b/llvm/lib/Transforms/Scalar/GCSE.cpp index a3452a3f847..776ff6603aa 100644 --- a/llvm/lib/Transforms/Scalar/GCSE.cpp +++ b/llvm/lib/Transforms/Scalar/GCSE.cpp @@ -22,8 +22,8 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Analysis/ValueNumbering.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/DepthFirstIterator.h" -#include "Support/Statistic.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/Statistic.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp b/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp index 7c1f1161f59..a2693534879 100644 --- a/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp +++ b/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp @@ -46,8 +46,8 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Support/CFG.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/CommandLine.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp index 97cdc1196ea..2340c49b563 100644 --- a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp @@ -49,8 +49,8 @@ #include "llvm/Support/InstIterator.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Support/PatternMatch.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <algorithm> using namespace llvm; using namespace llvm::PatternMatch; diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp index 792a672f04b..9a104db00ad 100644 --- a/llvm/lib/Transforms/Scalar/LICM.cpp +++ b/llvm/lib/Transforms/Scalar/LICM.cpp @@ -42,9 +42,9 @@ #include "llvm/Support/CFG.h" #include "llvm/Transforms/Utils/PromoteMemToReg.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/LoopSimplify.cpp b/llvm/lib/Transforms/Scalar/LoopSimplify.cpp index 2a4d88b99eb..81cf8e27780 100644 --- a/llvm/lib/Transforms/Scalar/LoopSimplify.cpp +++ b/llvm/lib/Transforms/Scalar/LoopSimplify.cpp @@ -41,10 +41,10 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Support/CFG.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/SetOperations.h" -#include "Support/SetVector.h" -#include "Support/Statistic.h" -#include "Support/DepthFirstIterator.h" +#include "llvm/ADT/SetOperations.h" +#include "llvm/ADT/SetVector.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/DepthFirstIterator.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/LoopUnroll.cpp b/llvm/lib/Transforms/Scalar/LoopUnroll.cpp index a9cced5ce14..d24b94fac85 100644 --- a/llvm/lib/Transforms/Scalar/LoopUnroll.cpp +++ b/llvm/lib/Transforms/Scalar/LoopUnroll.cpp @@ -24,10 +24,10 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Transforms/Utils/Cloning.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include <cstdio> #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp b/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp index 83dc1836d6b..73a99c22121 100644 --- a/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp +++ b/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp @@ -35,8 +35,8 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Transforms/Utils/Cloning.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/LowerAllocations.cpp b/llvm/lib/Transforms/Scalar/LowerAllocations.cpp index a5197a0e01c..f3c1a79052c 100644 --- a/llvm/lib/Transforms/Scalar/LowerAllocations.cpp +++ b/llvm/lib/Transforms/Scalar/LowerAllocations.cpp @@ -18,7 +18,7 @@ #include "llvm/Instructions.h" #include "llvm/Constants.h" #include "llvm/Pass.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/LowerInvoke.cpp b/llvm/lib/Transforms/Scalar/LowerInvoke.cpp index 835a5ae7892..2c6cf7e91ad 100644 --- a/llvm/lib/Transforms/Scalar/LowerInvoke.cpp +++ b/llvm/lib/Transforms/Scalar/LowerInvoke.cpp @@ -41,8 +41,8 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "Support/Statistic.h" -#include "Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/CommandLine.h" #include <csetjmp> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/LowerPacked.cpp b/llvm/lib/Transforms/Scalar/LowerPacked.cpp index 2d90ccb3008..7a42bf7fbae 100644 --- a/llvm/lib/Transforms/Scalar/LowerPacked.cpp +++ b/llvm/lib/Transforms/Scalar/LowerPacked.cpp @@ -19,7 +19,7 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Support/InstVisitor.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <map> #include <iostream> diff --git a/llvm/lib/Transforms/Scalar/LowerSelect.cpp b/llvm/lib/Transforms/Scalar/LowerSelect.cpp index 647658e3a54..f914e747a15 100644 --- a/llvm/lib/Transforms/Scalar/LowerSelect.cpp +++ b/llvm/lib/Transforms/Scalar/LowerSelect.cpp @@ -23,7 +23,7 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Type.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/LowerSwitch.cpp b/llvm/lib/Transforms/Scalar/LowerSwitch.cpp index 710188aa2b6..24a2963c27e 100644 --- a/llvm/lib/Transforms/Scalar/LowerSwitch.cpp +++ b/llvm/lib/Transforms/Scalar/LowerSwitch.cpp @@ -18,8 +18,8 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Pass.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/Mem2Reg.cpp b/llvm/lib/Transforms/Scalar/Mem2Reg.cpp index 12dd5825253..39400e72adc 100644 --- a/llvm/lib/Transforms/Scalar/Mem2Reg.cpp +++ b/llvm/lib/Transforms/Scalar/Mem2Reg.cpp @@ -18,7 +18,7 @@ #include "llvm/Instructions.h" #include "llvm/Function.h" #include "llvm/Target/TargetData.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/PRE.cpp b/llvm/lib/Transforms/Scalar/PRE.cpp index 38c5595ebc6..f8752336b2e 100644 --- a/llvm/lib/Transforms/Scalar/PRE.cpp +++ b/llvm/lib/Transforms/Scalar/PRE.cpp @@ -29,11 +29,11 @@ #include "llvm/Analysis/PostDominators.h" #include "llvm/Analysis/ValueNumbering.h" #include "llvm/Transforms/Scalar.h" -#include "Support/Debug.h" -#include "Support/DepthFirstIterator.h" -#include "Support/PostOrderIterator.h" -#include "Support/Statistic.h" -#include "Support/hash_set" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/hash_set" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp b/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp index 5227e7c6125..202ca74040a 100644 --- a/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp +++ b/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp @@ -38,7 +38,7 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Support/CFG.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/Reassociate.cpp b/llvm/lib/Transforms/Scalar/Reassociate.cpp index 6f843448892..c74cf51ccc4 100644 --- a/llvm/lib/Transforms/Scalar/Reassociate.cpp +++ b/llvm/lib/Transforms/Scalar/Reassociate.cpp @@ -30,9 +30,9 @@ #include "llvm/Pass.h" #include "llvm/Constant.h" #include "llvm/Support/CFG.h" -#include "Support/Debug.h" -#include "Support/PostOrderIterator.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/SCCP.cpp b/llvm/lib/Transforms/Scalar/SCCP.cpp index 1c39160d9bd..497bf0ae9bb 100644 --- a/llvm/lib/Transforms/Scalar/SCCP.cpp +++ b/llvm/lib/Transforms/Scalar/SCCP.cpp @@ -30,10 +30,10 @@ #include "llvm/Type.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/Debug.h" -#include "Support/hash_map" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/hash_map" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp index 32c9040c5b7..a0d5afe0ce5 100644 --- a/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp +++ b/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp @@ -29,9 +29,9 @@ #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Target/TargetData.h" #include "llvm/Transforms/Utils/PromoteMemToReg.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp b/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp index 8e0f7d33073..0f9946e6ee6 100644 --- a/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp @@ -23,7 +23,7 @@ #include "llvm/Module.h" #include "llvm/Support/CFG.h" #include "llvm/Pass.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/Scalar/TailDuplication.cpp b/llvm/lib/Transforms/Scalar/TailDuplication.cpp index 2a5a6062821..717a845765a 100644 --- a/llvm/lib/Transforms/Scalar/TailDuplication.cpp +++ b/llvm/lib/Transforms/Scalar/TailDuplication.cpp @@ -26,9 +26,9 @@ #include "llvm/Type.h" #include "llvm/Support/CFG.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp b/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp index 0ca5562bae9..758628ca64c 100644 --- a/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp +++ b/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp @@ -51,7 +51,7 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Support/CFG.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp b/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp index f5df6613345..4a5c9d904bf 100644 --- a/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp +++ b/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp @@ -22,7 +22,7 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Support/CFG.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp index aabc587b56d..5dd03bd9e75 100644 --- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp +++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp @@ -24,9 +24,9 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/Verifier.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/StringExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <set> using namespace llvm; diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp index 41454ae0cb1..fe27f308cf0 100644 --- a/llvm/lib/Transforms/Utils/Local.cpp +++ b/llvm/lib/Transforms/Utils/Local.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "Support/MathExtras.h" +#include "llvm/Support/MathExtras.h" #include "llvm/Transforms/Utils/Local.h" #include "llvm/Constants.h" #include "llvm/Instructions.h" diff --git a/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp index ced2315e0e7..81f5cd3ed3a 100644 --- a/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp +++ b/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp @@ -23,7 +23,7 @@ #include "llvm/Constant.h" #include "llvm/Support/CFG.h" #include "llvm/Support/StableBasicBlockNumbering.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" using namespace llvm; /// isAllocaPromotable - Return true if this alloca is legal for promotion. diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index e2a5c8e3657..c9321733304 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -17,7 +17,7 @@ #include "llvm/Instructions.h" #include "llvm/Type.h" #include "llvm/Support/CFG.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <algorithm> #include <functional> #include <set> diff --git a/llvm/lib/VMCore/AsmWriter.cpp b/llvm/lib/VMCore/AsmWriter.cpp index f70a82839aa..0c4a1f78267 100644 --- a/llvm/lib/VMCore/AsmWriter.cpp +++ b/llvm/lib/VMCore/AsmWriter.cpp @@ -26,8 +26,8 @@ #include "llvm/SymbolTable.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/CFG.h" -#include "Support/StringExtras.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/VMCore/BasicBlock.cpp b/llvm/lib/VMCore/BasicBlock.cpp index 005740904d7..32c86c4ce69 100644 --- a/llvm/lib/VMCore/BasicBlock.cpp +++ b/llvm/lib/VMCore/BasicBlock.cpp @@ -17,7 +17,7 @@ #include "llvm/Type.h" #include "llvm/Support/CFG.h" #include "llvm/SymbolTable.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include "SymbolTableListTraitsImpl.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/VMCore/Constants.cpp b/llvm/lib/VMCore/Constants.cpp index 8b28c0d3ff6..77c34296aa8 100644 --- a/llvm/lib/VMCore/Constants.cpp +++ b/llvm/lib/VMCore/Constants.cpp @@ -18,7 +18,7 @@ #include "llvm/Instructions.h" #include "llvm/SymbolTable.h" #include "llvm/Module.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <iostream> using namespace llvm; diff --git a/llvm/lib/VMCore/Dominators.cpp b/llvm/lib/VMCore/Dominators.cpp index b9eee7f4598..14ec3ccd9f3 100644 --- a/llvm/lib/VMCore/Dominators.cpp +++ b/llvm/lib/VMCore/Dominators.cpp @@ -17,8 +17,8 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Support/CFG.h" #include "llvm/Assembly/Writer.h" -#include "Support/DepthFirstIterator.h" -#include "Support/SetOperations.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/SetOperations.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/VMCore/Function.cpp b/llvm/lib/VMCore/Function.cpp index bf9c8b48bde..e918fd5878a 100644 --- a/llvm/lib/VMCore/Function.cpp +++ b/llvm/lib/VMCore/Function.cpp @@ -17,7 +17,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Instructions.h" #include "llvm/Intrinsics.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include "SymbolTableListTraitsImpl.h" using namespace llvm; diff --git a/llvm/lib/VMCore/Globals.cpp b/llvm/lib/VMCore/Globals.cpp index cfecbc91ce0..b84dbf7fd4a 100644 --- a/llvm/lib/VMCore/Globals.cpp +++ b/llvm/lib/VMCore/Globals.cpp @@ -16,7 +16,7 @@ #include "llvm/GlobalVariable.h" #include "llvm/Module.h" #include "llvm/SymbolTable.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" using namespace llvm; //===----------------------------------------------------------------------===// diff --git a/llvm/lib/VMCore/Instruction.cpp b/llvm/lib/VMCore/Instruction.cpp index 1350f05b9b1..f54acf5f03e 100644 --- a/llvm/lib/VMCore/Instruction.cpp +++ b/llvm/lib/VMCore/Instruction.cpp @@ -14,7 +14,7 @@ #include "llvm/Function.h" #include "llvm/SymbolTable.h" #include "llvm/Type.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" using namespace llvm; void Instruction::init() diff --git a/llvm/lib/VMCore/LeakDetector.cpp b/llvm/lib/VMCore/LeakDetector.cpp index dbdb7dd70f2..807bd22b075 100644 --- a/llvm/lib/VMCore/LeakDetector.cpp +++ b/llvm/lib/VMCore/LeakDetector.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include "llvm/Value.h" #include <iostream> #include <set> diff --git a/llvm/lib/VMCore/Mangler.cpp b/llvm/lib/VMCore/Mangler.cpp index ed58da05c94..69bbe261fa5 100644 --- a/llvm/lib/VMCore/Mangler.cpp +++ b/llvm/lib/VMCore/Mangler.cpp @@ -14,7 +14,7 @@ #include "llvm/Support/Mangler.h" #include "llvm/Module.h" #include "llvm/Type.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" using namespace llvm; static char HexDigit(int V) { diff --git a/llvm/lib/VMCore/Module.cpp b/llvm/lib/VMCore/Module.cpp index 125fd123f8c..d8caf7f1175 100644 --- a/llvm/lib/VMCore/Module.cpp +++ b/llvm/lib/VMCore/Module.cpp @@ -15,8 +15,8 @@ #include "llvm/InstrTypes.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" -#include "Support/STLExtras.h" -#include "Support/LeakDetector.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/Support/LeakDetector.h" #include "SymbolTableListTraitsImpl.h" #include <algorithm> #include <cstdarg> diff --git a/llvm/lib/VMCore/Pass.cpp b/llvm/lib/VMCore/Pass.cpp index d6fe2fba41c..5079b4ea65e 100644 --- a/llvm/lib/VMCore/Pass.cpp +++ b/llvm/lib/VMCore/Pass.cpp @@ -17,8 +17,8 @@ #include "PassManagerT.h" // PassManagerT implementation #include "llvm/Module.h" #include "llvm/ModuleProvider.h" -#include "Support/STLExtras.h" -#include "Support/TypeInfo.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/Support/TypeInfo.h" #include <iostream> #include <set> using namespace llvm; diff --git a/llvm/lib/VMCore/PassManagerT.h b/llvm/lib/VMCore/PassManagerT.h index 6c60a2d022d..95e0f563c94 100644 --- a/llvm/lib/VMCore/PassManagerT.h +++ b/llvm/lib/VMCore/PassManagerT.h @@ -23,9 +23,9 @@ #define LLVM_PASSMANAGER_T_H #include "llvm/Pass.h" -#include "Support/CommandLine.h" -#include "Support/LeakDetector.h" -#include "Support/Timer.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/LeakDetector.h" +#include "llvm/Support/Timer.h" #include <algorithm> #include <iostream> diff --git a/llvm/lib/VMCore/SymbolTable.cpp b/llvm/lib/VMCore/SymbolTable.cpp index afbb0b1c21d..e5191be198b 100644 --- a/llvm/lib/VMCore/SymbolTable.cpp +++ b/llvm/lib/VMCore/SymbolTable.cpp @@ -15,7 +15,7 @@ #include "llvm/SymbolTable.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <iostream> diff --git a/llvm/lib/VMCore/Type.cpp b/llvm/lib/VMCore/Type.cpp index bd0da45f460..0c76d1604b8 100644 --- a/llvm/lib/VMCore/Type.cpp +++ b/llvm/lib/VMCore/Type.cpp @@ -15,9 +15,9 @@ #include "llvm/DerivedTypes.h" #include "llvm/SymbolTable.h" #include "llvm/Constants.h" -#include "Support/DepthFirstIterator.h" -#include "Support/StringExtras.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <iostream> using namespace llvm; diff --git a/llvm/lib/VMCore/Value.cpp b/llvm/lib/VMCore/Value.cpp index e41c7fd1366..60be53db5b6 100644 --- a/llvm/lib/VMCore/Value.cpp +++ b/llvm/lib/VMCore/Value.cpp @@ -16,7 +16,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Constant.h" #include "llvm/GlobalValue.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include <algorithm> #include <iostream> using namespace llvm; diff --git a/llvm/lib/VMCore/Verifier.cpp b/llvm/lib/VMCore/Verifier.cpp index 9e99fe0136c..18d93383483 100644 --- a/llvm/lib/VMCore/Verifier.cpp +++ b/llvm/lib/VMCore/Verifier.cpp @@ -53,7 +53,7 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Support/CFG.h" #include "llvm/Support/InstVisitor.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <iostream> #include <sstream> diff --git a/llvm/projects/Stacker/lib/compiler/StackerParser.y b/llvm/projects/Stacker/lib/compiler/StackerParser.y index 2256b30ccf7..40411d96280 100644 --- a/llvm/projects/Stacker/lib/compiler/StackerParser.y +++ b/llvm/projects/Stacker/lib/compiler/StackerParser.y @@ -16,8 +16,8 @@ #include "llvm/SymbolTable.h" #include "llvm/Module.h" #include "llvm/Instructions.h" -#include "Support/STLExtras.h" -#include "Support/DepthFirstIterator.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/DepthFirstIterator.h" #include <list> #include <utility> #include <algorithm> diff --git a/llvm/projects/Stacker/lib/runtime/Makefile b/llvm/projects/Stacker/lib/runtime/Makefile index eaf1b482870..5f149ad4321 100644 --- a/llvm/projects/Stacker/lib/runtime/Makefile +++ b/llvm/projects/Stacker/lib/runtime/Makefile @@ -8,7 +8,8 @@ LEVEL=../../../.. # # Give the name of a library. This will build a dynamic version. # -SHARED_LIBRARY=1 +BYTECODE_LIBRARY=1 +DONT_BUILD_RELINKED=1 LIBRARYNAME=stkr_runtime # diff --git a/llvm/projects/Stacker/tools/stkrc/stkrc.cpp b/llvm/projects/Stacker/tools/stkrc/stkrc.cpp index c5d92e6c2ef..6006bb476e2 100644 --- a/llvm/projects/Stacker/tools/stkrc/stkrc.cpp +++ b/llvm/projects/Stacker/tools/stkrc/stkrc.cpp @@ -21,7 +21,7 @@ #include "llvm/Assembly/Parser.h" #include "llvm/Bytecode/Writer.h" #include "llvm/Analysis/Verifier.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include <fstream> #include <iostream> diff --git a/llvm/projects/sample/lib/sample/sample.c b/llvm/projects/sample/lib/sample/sample.c index bd78ed57465..631a48d1ad1 100644 --- a/llvm/projects/sample/lib/sample/sample.c +++ b/llvm/projects/sample/lib/sample/sample.c @@ -11,7 +11,7 @@ #include <stdlib.h> // LLVM Header File -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" // Header file global to this project #include "sample.h" diff --git a/llvm/runtime/libtrace/tracelib.c b/llvm/runtime/libtrace/tracelib.c index 5b4c7f68319..9de5c296b48 100644 --- a/llvm/runtime/libtrace/tracelib.c +++ b/llvm/runtime/libtrace/tracelib.c @@ -10,7 +10,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" /*===---------------------------------------------------------------------===== * HASH FUNCTIONS diff --git a/llvm/tools/analyze/GraphPrinters.cpp b/llvm/tools/analyze/GraphPrinters.cpp index fc74c480cf2..1176a8df109 100644 --- a/llvm/tools/analyze/GraphPrinters.cpp +++ b/llvm/tools/analyze/GraphPrinters.cpp @@ -14,7 +14,7 @@ // //===----------------------------------------------------------------------===// -#include "Support/GraphWriter.h" +#include "llvm/Support/GraphWriter.h" #include "llvm/Pass.h" #include "llvm/Value.h" #include "llvm/Analysis/CallGraph.h" diff --git a/llvm/tools/analyze/analyze.cpp b/llvm/tools/analyze/analyze.cpp index 0207b8c6e1a..1542a1a068a 100644 --- a/llvm/tools/analyze/analyze.cpp +++ b/llvm/tools/analyze/analyze.cpp @@ -24,8 +24,8 @@ #include "llvm/Target/TargetData.h" #include "llvm/Support/PassNameParser.h" #include "llvm/System/Signals.h" -#include "Support/PluginLoader.h" -#include "Support/Timer.h" +#include "llvm/Support/PluginLoader.h" +#include "llvm/Support/Timer.h" #include <algorithm> using namespace llvm; diff --git a/llvm/tools/bugpoint/BugDriver.cpp b/llvm/tools/bugpoint/BugDriver.cpp index 1826b7b780c..6d13f967118 100644 --- a/llvm/tools/bugpoint/BugDriver.cpp +++ b/llvm/tools/bugpoint/BugDriver.cpp @@ -20,8 +20,8 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/Support/Linker.h" #include "llvm/Support/ToolRunner.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include <iostream> #include <memory> diff --git a/llvm/tools/bugpoint/CrashDebugger.cpp b/llvm/tools/bugpoint/CrashDebugger.cpp index 69837f9c2a8..545d767c2ae 100644 --- a/llvm/tools/bugpoint/CrashDebugger.cpp +++ b/llvm/tools/bugpoint/CrashDebugger.cpp @@ -26,7 +26,7 @@ #include "llvm/Support/ToolRunner.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Utils/Cloning.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/FileUtilities.h" #include <fstream> #include <set> using namespace llvm; diff --git a/llvm/tools/bugpoint/ExecutionDriver.cpp b/llvm/tools/bugpoint/ExecutionDriver.cpp index 62f0a242a6f..0687c4c08f3 100644 --- a/llvm/tools/bugpoint/ExecutionDriver.cpp +++ b/llvm/tools/bugpoint/ExecutionDriver.cpp @@ -14,10 +14,10 @@ #include "BugDriver.h" #include "llvm/Support/ToolRunner.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/FileUtilities.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/Support/SystemUtils.h" #include <fstream> using namespace llvm; diff --git a/llvm/tools/bugpoint/ExtractFunction.cpp b/llvm/tools/bugpoint/ExtractFunction.cpp index 7806857f2ef..cf02ef73a95 100644 --- a/llvm/tools/bugpoint/ExtractFunction.cpp +++ b/llvm/tools/bugpoint/ExtractFunction.cpp @@ -24,9 +24,9 @@ #include "llvm/Transforms/Utils/Cloning.h" #include "llvm/Transforms/Utils/FunctionUtils.h" #include "llvm/Target/TargetData.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/FileUtilities.h" #include <set> using namespace llvm; diff --git a/llvm/tools/bugpoint/Miscompilation.cpp b/llvm/tools/bugpoint/Miscompilation.cpp index 0b7711b611b..bead5dc9924 100644 --- a/llvm/tools/bugpoint/Miscompilation.cpp +++ b/llvm/tools/bugpoint/Miscompilation.cpp @@ -23,8 +23,8 @@ #include "llvm/Support/Mangler.h" #include "llvm/Transforms/Utils/Cloning.h" #include "llvm/Support/Linker.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" using namespace llvm; namespace llvm { diff --git a/llvm/tools/bugpoint/OptimizerDriver.cpp b/llvm/tools/bugpoint/OptimizerDriver.cpp index c5c437ccdb8..23e40fda5c3 100644 --- a/llvm/tools/bugpoint/OptimizerDriver.cpp +++ b/llvm/tools/bugpoint/OptimizerDriver.cpp @@ -21,7 +21,7 @@ #include "llvm/Analysis/Verifier.h" #include "llvm/Bytecode/WriteBytecodePass.h" #include "llvm/Target/TargetData.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/FileUtilities.h" #include <fstream> #include <unistd.h> #include <sys/types.h> diff --git a/llvm/tools/bugpoint/bugpoint.cpp b/llvm/tools/bugpoint/bugpoint.cpp index 1ff84f24089..a4eae3cecd0 100644 --- a/llvm/tools/bugpoint/bugpoint.cpp +++ b/llvm/tools/bugpoint/bugpoint.cpp @@ -16,11 +16,12 @@ #include "BugDriver.h" #include "llvm/Support/PassNameParser.h" #include "llvm/Support/ToolRunner.h" -#include "Support/CommandLine.h" +#include "llvm/System/SysConfig.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/PluginLoader.h" #include "llvm/System/Signals.h" -#include "Support/PluginLoader.h" -#include "Config/unistd.h" -#include <sys/resource.h> +#include "llvm/Config/unistd.h" +//#include <sys/resource.h> using namespace llvm; static cl::list<std::string> @@ -45,14 +46,8 @@ int main(int argc, char **argv) { D.addPasses(PassList.begin(), PassList.end()); // Bugpoint has the ability of generating a plethora of core files, so to - // avoid filling up the disk, set the max core file size to 0. - struct rlimit rlim; - rlim.rlim_cur = rlim.rlim_max = 0; - int res = setrlimit(RLIMIT_CORE, &rlim); - if (res < 0) { - // setrlimit() may have failed, but we're not going to let that stop us - perror("setrlimit: RLIMIT_CORE"); - } + // avoid filling up the disk, we prevent it + sys::PreventCoreFiles(); try { return D.run(); diff --git a/llvm/tools/extract/extract.cpp b/llvm/tools/extract/extract.cpp index 050793b2e69..95822d03899 100644 --- a/llvm/tools/extract/extract.cpp +++ b/llvm/tools/extract/extract.cpp @@ -18,7 +18,7 @@ #include "llvm/Bytecode/WriteBytecodePass.h" #include "llvm/Transforms/IPO.h" #include "llvm/Target/TargetData.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include <memory> #include <fstream> diff --git a/llvm/tools/gccas/gccas.cpp b/llvm/tools/gccas/gccas.cpp index c5f6c2395ac..ab64bbf18fc 100644 --- a/llvm/tools/gccas/gccas.cpp +++ b/llvm/tools/gccas/gccas.cpp @@ -22,7 +22,7 @@ #include "llvm/Target/TargetData.h" #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include <memory> #include <fstream> diff --git a/llvm/tools/gccld/GenerateCode.cpp b/llvm/tools/gccld/GenerateCode.cpp index 029d5b90fdc..633517d09d3 100644 --- a/llvm/tools/gccld/GenerateCode.cpp +++ b/llvm/tools/gccld/GenerateCode.cpp @@ -24,8 +24,8 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Support/Linker.h" -#include "Support/SystemUtils.h" -#include "Support/CommandLine.h" +#include "llvm/Support/SystemUtils.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; namespace { diff --git a/llvm/tools/gccld/Linker.cpp b/llvm/tools/gccld/Linker.cpp index fcaa7af3d5f..fa9ec70306c 100644 --- a/llvm/tools/gccld/Linker.cpp +++ b/llvm/tools/gccld/Linker.cpp @@ -21,11 +21,11 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Support/Linker.h" -#include "Config/config.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Config/config.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/SystemUtils.h" #include <algorithm> #include <fstream> #include <memory> diff --git a/llvm/tools/gccld/gccld.cpp b/llvm/tools/gccld/gccld.cpp index ba4681534d8..9137124f19a 100644 --- a/llvm/tools/gccld/gccld.cpp +++ b/llvm/tools/gccld/gccld.cpp @@ -29,10 +29,10 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Support/Linker.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/SystemUtils.h" #include <fstream> #include <memory> using namespace llvm; diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp index 0d35ea20aa1..4e1e0cce7bb 100644 --- a/llvm/tools/llc/llc.cpp +++ b/llvm/tools/llc/llc.cpp @@ -20,8 +20,8 @@ #include "llvm/Module.h" #include "llvm/PassManager.h" #include "llvm/Pass.h" -#include "Support/CommandLine.h" -#include "Support/PluginLoader.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/PluginLoader.h" #include "llvm/System/Signals.h" #include <fstream> #include <iostream> diff --git a/llvm/tools/llee/ExecveHandler.c b/llvm/tools/llee/ExecveHandler.c index 088f1dba535..89d15365385 100644 --- a/llvm/tools/llee/ExecveHandler.c +++ b/llvm/tools/llee/ExecveHandler.c @@ -13,7 +13,7 @@ \*===----------------------------------------------------------------------===*/ #include "SysUtils.h" -#include "Config/unistd.h" +#include "llvm/Config/unistd.h" #include <errno.h> #include <stdlib.h> #include <fcntl.h> diff --git a/llvm/tools/llee/OSInterface.h b/llvm/tools/llee/OSInterface.h index 26b48fd1af5..0e026e10b14 100644 --- a/llvm/tools/llee/OSInterface.h +++ b/llvm/tools/llee/OSInterface.h @@ -16,7 +16,7 @@ #ifndef OS_INTERFACE_H #define OS_INTERFACE_H -#include "Config/sys/types.h" +#include "llvm/Config/sys/types.h" struct stat; diff --git a/llvm/tools/llee/StorageProxy.c b/llvm/tools/llee/StorageProxy.c index 656d3164cfc..05ffdf4b4c7 100644 --- a/llvm/tools/llee/StorageProxy.c +++ b/llvm/tools/llee/StorageProxy.c @@ -7,10 +7,10 @@ #include "OSInterface.h" #include "SysUtils.h" -#include "Config/fcntl.h" -#include "Config/unistd.h" -#include "Config/sys/types.h" -#include "Config/sys/stat.h" +#include "llvm/Config/fcntl.h" +#include "llvm/Config/unistd.h" +#include "llvm/Config/sys/types.h" +#include "llvm/Config/sys/stat.h" #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/llvm/tools/llee/SysUtils.c b/llvm/tools/llee/SysUtils.c index d7bab1d989d..0325c40b9d7 100644 --- a/llvm/tools/llee/SysUtils.c +++ b/llvm/tools/llee/SysUtils.c @@ -13,12 +13,12 @@ \*===----------------------------------------------------------------------===*/ #include "SysUtils.h" -#include "Config/dlfcn.h" -#include "Config/fcntl.h" -#include "Config/unistd.h" -#include "Config/sys/stat.h" -#include "Config/sys/types.h" -#include "Config/sys/wait.h" +#include "llvm/Config/dlfcn.h" +#include "llvm/Config/fcntl.h" +#include "llvm/Config/unistd.h" +#include "llvm/Config/sys/stat.h" +#include "llvm/Config/sys/types.h" +#include "llvm/Config/sys/wait.h" #include <errno.h> #include <stdio.h> #include <stdlib.h> diff --git a/llvm/tools/lli/lli.cpp b/llvm/tools/lli/lli.cpp index 066bfbc9e9d..eb8ac0126e9 100644 --- a/llvm/tools/lli/lli.cpp +++ b/llvm/tools/lli/lli.cpp @@ -19,8 +19,8 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/ExecutionEngine/ExecutionEngine.h" #include "llvm/ExecutionEngine/GenericValue.h" -#include "Support/CommandLine.h" -#include "Support/PluginLoader.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/PluginLoader.h" #include "llvm/System/Signals.h" #include <iostream> diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index 4b79cd367d8..07fc1810e82 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -13,8 +13,8 @@ #include "llvm/Module.h" #include "llvm/Bytecode/Reader.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" #include <string> #include <fstream> diff --git a/llvm/tools/llvm-as/llvm-as.cpp b/llvm/tools/llvm-as/llvm-as.cpp index b49702c32ee..1d48f7a7fa1 100644 --- a/llvm/tools/llvm-as/llvm-as.cpp +++ b/llvm/tools/llvm-as/llvm-as.cpp @@ -19,7 +19,7 @@ #include "llvm/Assembly/Parser.h" #include "llvm/Bytecode/Writer.h" #include "llvm/Analysis/Verifier.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include <fstream> #include <iostream> diff --git a/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp b/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp index e3dff659d2f..d4be138fe77 100644 --- a/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp +++ b/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp @@ -31,7 +31,7 @@ #include "llvm/Analysis/Verifier.h" #include "llvm/Bytecode/Analyzer.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include <fstream> #include <iostream> diff --git a/llvm/tools/llvm-db/CLIDebugger.cpp b/llvm/tools/llvm-db/CLIDebugger.cpp index c48a919f80a..75798d23527 100644 --- a/llvm/tools/llvm-db/CLIDebugger.cpp +++ b/llvm/tools/llvm-db/CLIDebugger.cpp @@ -15,7 +15,7 @@ #include "CLIDebugger.h" #include "CLICommand.h" #include "llvm/Debugger/SourceFile.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include <iostream> using namespace llvm; diff --git a/llvm/tools/llvm-db/Commands.cpp b/llvm/tools/llvm-db/Commands.cpp index 56dbd53526c..6df2f693a16 100644 --- a/llvm/tools/llvm-db/Commands.cpp +++ b/llvm/tools/llvm-db/Commands.cpp @@ -18,8 +18,8 @@ #include "llvm/Debugger/SourceLanguage.h" #include "llvm/Debugger/SourceFile.h" #include "llvm/Debugger/InferiorProcess.h" -#include "Support/FileUtilities.h" -#include "Support/StringExtras.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/ADT/StringExtras.h" #include <iostream> using namespace llvm; diff --git a/llvm/tools/llvm-db/llvm-db.cpp b/llvm/tools/llvm-db/llvm-db.cpp index 1b7385c0658..23cbca2ef4f 100644 --- a/llvm/tools/llvm-db/llvm-db.cpp +++ b/llvm/tools/llvm-db/llvm-db.cpp @@ -13,8 +13,8 @@ //===----------------------------------------------------------------------===// #include "CLIDebugger.h" -#include "Support/CommandLine.h" -#include "Support/PluginLoader.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/PluginLoader.h" #include "llvm/System/Signals.h" #include <iostream> diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp index ac8101b6c42..37d5c84f751 100644 --- a/llvm/tools/llvm-dis/llvm-dis.cpp +++ b/llvm/tools/llvm-dis/llvm-dis.cpp @@ -20,7 +20,7 @@ #include "llvm/PassManager.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Assembly/PrintModulePass.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include <fstream> #include <memory> diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp index 3cd3c7b54dd..664529850c5 100644 --- a/llvm/tools/llvm-link/llvm-link.cpp +++ b/llvm/tools/llvm-link/llvm-link.cpp @@ -17,8 +17,8 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/Writer.h" #include "llvm/Support/Linker.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" #include <fstream> #include <iostream> diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index ba8b5d7f0d5..1a2b40e9c9b 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -18,8 +18,8 @@ #include "llvm/Module.h" #include "llvm/Bytecode/Reader.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" #include <cctype> #include <cerrno> diff --git a/llvm/tools/llvm-prof/llvm-prof.cpp b/llvm/tools/llvm-prof/llvm-prof.cpp index efb44d69b5c..88344078bda 100644 --- a/llvm/tools/llvm-prof/llvm-prof.cpp +++ b/llvm/tools/llvm-prof/llvm-prof.cpp @@ -18,7 +18,7 @@ #include "llvm/Assembly/AsmAnnotationWriter.h" #include "llvm/Analysis/ProfileInfoLoader.h" #include "llvm/Bytecode/Reader.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include <cstdio> #include <iostream> diff --git a/llvm/tools/llvm-stub/llvm-stub.c b/llvm/tools/llvm-stub/llvm-stub.c index a64c5df9f47..8d5175af100 100644 --- a/llvm/tools/llvm-stub/llvm-stub.c +++ b/llvm/tools/llvm-stub/llvm-stub.c @@ -23,7 +23,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "Config/unistd.h" /* provides definition of execve */ +#include "llvm/Config/unistd.h" /* provides definition of execve */ int main(int argc, char** argv) { const char *Interp = getenv("LLVMINTERP"); diff --git a/llvm/tools/llvmc/CompilerDriver.cpp b/llvm/tools/llvmc/CompilerDriver.cpp index 51164d24678..c015d9e867a 100644 --- a/llvm/tools/llvmc/CompilerDriver.cpp +++ b/llvm/tools/llvmc/CompilerDriver.cpp @@ -17,9 +17,9 @@ #include "llvm/Module.h" #include "llvm/Bytecode/Reader.h" #include "llvm/System/Signals.h" -#include "Support/FileUtilities.h" -#include "Support/SetVector.h" -#include "Support/StringExtras.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/ADT/SetVector.h" +#include "llvm/ADT/StringExtras.h" #include <iostream> using namespace llvm; diff --git a/llvm/tools/llvmc/Configuration.cpp b/llvm/tools/llvmc/Configuration.cpp index c398e529d74..6b5d33975f2 100644 --- a/llvm/tools/llvmc/Configuration.cpp +++ b/llvm/tools/llvmc/Configuration.cpp @@ -15,9 +15,9 @@ #include "Configuration.h" #include "ConfigLexer.h" #include "CompilerDriver.h" -#include "Config/config.h" -#include "Support/CommandLine.h" -#include "Support/StringExtras.h" +#include "llvm/Config/config.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/StringExtras.h" #include <iostream> #include <fstream> diff --git a/llvm/tools/llvmc/Configuration.h b/llvm/tools/llvmc/Configuration.h index 2ed565a80ed..e194dd072ef 100644 --- a/llvm/tools/llvmc/Configuration.h +++ b/llvm/tools/llvmc/Configuration.h @@ -15,7 +15,7 @@ #define LLVM_TOOLS_LLVMC_CONFIGDATA_H #include "CompilerDriver.h" -#include <Support/hash_map> +#include <llvm/ADT/hash_map> namespace llvm { /// This class provides the high level interface to the LLVM Compiler Driver. diff --git a/llvm/tools/llvmc/llvmc.cpp b/llvm/tools/llvmc/llvmc.cpp index 8dab3017908..f457795a0c7 100644 --- a/llvm/tools/llvmc/llvmc.cpp +++ b/llvm/tools/llvmc/llvmc.cpp @@ -18,7 +18,7 @@ #include "Configuration.h" #include "llvm/Pass.h" #include "llvm/System/Signals.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <iostream> using namespace llvm; diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp index 4810ebd8703..f5666bc08e6 100644 --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -21,8 +21,8 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Support/PassNameParser.h" #include "llvm/System/Signals.h" -#include "Support/PluginLoader.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/PluginLoader.h" +#include "llvm/Support/SystemUtils.h" #include <fstream> #include <memory> #include <algorithm> diff --git a/llvm/utils/TableGen/CodeEmitterGen.cpp b/llvm/utils/TableGen/CodeEmitterGen.cpp index 906f4d6c724..dcf10672a3a 100644 --- a/llvm/utils/TableGen/CodeEmitterGen.cpp +++ b/llvm/utils/TableGen/CodeEmitterGen.cpp @@ -16,7 +16,7 @@ #include "CodeEmitterGen.h" #include "CodeGenTarget.h" #include "Record.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" using namespace llvm; void CodeEmitterGen::run(std::ostream &o) { diff --git a/llvm/utils/TableGen/FileParser.y b/llvm/utils/TableGen/FileParser.y index bf10abc8be7..8781049956b 100644 --- a/llvm/utils/TableGen/FileParser.y +++ b/llvm/utils/TableGen/FileParser.y @@ -13,7 +13,7 @@ %{ #include "Record.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <cstdio> #define YYERROR_VERBOSE 1 diff --git a/llvm/utils/TableGen/InstrSelectorEmitter.cpp b/llvm/utils/TableGen/InstrSelectorEmitter.cpp index f6ca2a22e46..9a2ce4a6e87 100644 --- a/llvm/utils/TableGen/InstrSelectorEmitter.cpp +++ b/llvm/utils/TableGen/InstrSelectorEmitter.cpp @@ -14,8 +14,8 @@ #include "InstrSelectorEmitter.h" #include "Record.h" -#include "Support/Debug.h" -#include "Support/StringExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/StringExtras.h" #include <set> using namespace llvm; diff --git a/llvm/utils/TableGen/RegisterInfoEmitter.cpp b/llvm/utils/TableGen/RegisterInfoEmitter.cpp index ef79c35017e..487890d374d 100644 --- a/llvm/utils/TableGen/RegisterInfoEmitter.cpp +++ b/llvm/utils/TableGen/RegisterInfoEmitter.cpp @@ -17,8 +17,8 @@ #include "CodeGenTarget.h" #include "CodeGenRegisters.h" #include "Record.h" -#include "Support/StringExtras.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/STLExtras.h" #include <set> using namespace llvm; diff --git a/llvm/utils/TableGen/TableGen.cpp b/llvm/utils/TableGen/TableGen.cpp index 14e2352ece1..15b313191e5 100644 --- a/llvm/utils/TableGen/TableGen.cpp +++ b/llvm/utils/TableGen/TableGen.cpp @@ -16,9 +16,9 @@ //===----------------------------------------------------------------------===// #include "Record.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/FileUtilities.h" #include "CodeEmitterGen.h" #include "RegisterInfoEmitter.h" #include "InstrInfoEmitter.h" diff --git a/llvm/utils/fpcmp/fpcmp.cpp b/llvm/utils/fpcmp/fpcmp.cpp index e45c3c0a276..ff93b9bc49e 100644 --- a/llvm/utils/fpcmp/fpcmp.cpp +++ b/llvm/utils/fpcmp/fpcmp.cpp @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include <iostream> #include <cmath> |
