[cfe-commits] r134050 - in /cfe/trunk: docs/doxygen.cfg lib/CodeGen/BackendUtil.cpp

Tue Jun 28 18:14:32 PDT 2011

Author: evancheng
Date: Tue Jun 28 20:14:32 2011
New Revision: 134050

URL: http://llvm.org/viewvc/llvm-project?rev=134050&view=rev
Log:
SubtargetFeature.h has been moved to MC.

Added:
    cfe/trunk/docs/doxygen.cfg
      - copied, changed from r131233, cfe/trunk/docs/doxygen.cfg
Modified:
    cfe/trunk/lib/CodeGen/BackendUtil.cpp

Copied: cfe/trunk/docs/doxygen.cfg (from r131233, cfe/trunk/docs/doxygen.cfg)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/doxygen.cfg?p2=cfe/trunk/docs/doxygen.cfg&p1=cfe/trunk/docs/doxygen.cfg&r1=131233&r2=134050&rev=134050&view=diff
==============================================================================

--- cfe/trunk/docs/doxygen.cfg (original)
+++ cfe/trunk/docs/doxygen.cfg Tue Jun 28 20:14:32 2011
@@ -23,14 +23,14 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = mainline
+PROJECT_NUMBER         = 3.0svn
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ../docs/doxygen
+OUTPUT_DIRECTORY       = /Volumes/Ebi/echeng/llvm/tools/clang/docs/doxygen
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -450,9 +450,9 @@
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ../include \
-                         ../lib \
-                         ../docs/doxygen.intro
+INPUT                  = /Volumes/Ebi/echeng/llvm/tools/clang/docs/../include \
+                         /Volumes/Ebi/echeng/llvm/tools/clang/docs/../lib \
+                         /Volumes/Ebi/echeng/llvm/tools/clang/docs/doxygen.intro
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -493,7 +493,7 @@
 # directories that contain example code fragments that are included (see 
 # the \include command).
 
-EXAMPLE_PATH           = ../examples
+EXAMPLE_PATH           = /Volumes/Ebi/echeng/llvm/tools/clang/docs/../examples
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -513,7 +513,7 @@
 # directories that contain image that are included in the documentation (see 
 # the \image command).
 
-IMAGE_PATH             = ../docs/img
+IMAGE_PATH             = /Volumes/Ebi/echeng/llvm/tools/clang/docs/img
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should 
 # invoke to filter for each input file. Doxygen will invoke the filter program 
@@ -609,7 +609,7 @@
 # The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
 # should be ignored while generating the index headers.
 
-IGNORE_PREFIX          = llvm::
+IGNORE_PREFIX          = clang::
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
@@ -636,13 +636,13 @@
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER            = ../docs/doxygen.header
+HTML_HEADER            = /Volumes/Ebi/echeng/llvm/tools/clang/docs/doxygen.header
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = ../docs/doxygen.footer
+HTML_FOOTER            = /Volumes/Ebi/echeng/llvm/tools/clang/docs/doxygen.footer
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
@@ -651,7 +651,7 @@
 # the style sheet file to the HTML output directory, so don't put your own 
 # stylesheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        = ../docs/doxygen.css
+HTML_STYLESHEET        = /Volumes/Ebi/echeng/llvm/tools/clang/docs/doxygen.css
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
 # files or namespaces will be aligned in HTML using tables. If set to 
@@ -1157,7 +1157,7 @@
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
-DOT_PATH               = dot
+DOT_PATH               = /usr/local/bin/dot
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that 
 # contain dot files that are included in the documentation (see the 

Modified: cfe/trunk/lib/CodeGen/BackendUtil.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp?rev=134050&r1=134049&r2=134050&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/BackendUtil.cpp (original)
+++ cfe/trunk/lib/CodeGen/BackendUtil.cpp Tue Jun 28 20:14:32 2011
@@ -18,13 +18,13 @@
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/CodeGen/RegAllocRegistry.h"
 #include "llvm/CodeGen/SchedulerRegistry.h"
+#include "llvm/MC/SubtargetFeature.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/PassManagerBuilder.h"
 #include "llvm/Support/Timer.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/SubtargetFeature.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"



