6 files changed, 13 insertions, 14 deletions
diff --git a/llvm/utils/TableGen/CodeGenWrappers.cpp b/llvm/utils/TableGen/CodeGenTarget.cpp
index fe4ad2634da..eef94db0b99 100644
--- a/llvm/utils/TableGen/CodeGenWrappers.cpp
+++ b/llvm/utils/TableGen/CodeGenTarget.cpp
@@ -1,4 +1,4 @@
-//===- CodeGenWrappers.cpp - Code Generation Class Wrappers -----*- C++ -*-===//
+//===- CodeGenTarget.cpp - CodeGen Target Class Wrapper ---------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,14 +7,14 @@
 // 
 //===----------------------------------------------------------------------===//
 //
-// These classes wrap target description classes used by the various code
+// This class wrap target description classes used by the various code
 // generation TableGen backends.  This makes it easier to access the data and
 // provides a single place that needs to check it for validity.  All of these
 // classes throw exceptions on error conditions.
 //
 //===----------------------------------------------------------------------===//
 
-#include "CodeGenWrappers.h"
+#include "CodeGenTarget.h"
 #include "Record.h"
 using namespace llvm;
 
diff --git a/llvm/utils/TableGen/CodeGenWrappers.h b/llvm/utils/TableGen/CodeGenTarget.h
index 948360e2b11..aad277c516a 100644
--- a/llvm/utils/TableGen/CodeGenWrappers.h
+++ b/llvm/utils/TableGen/CodeGenTarget.h
@@ -1,4 +1,4 @@
-//===- CodeGenWrappers.h - Code Generation Class Wrappers -------*- C++ -*-===//
+//===- CodeGenTarget.h - Target Class Wrapper -------------------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,15 +7,15 @@
 // 
 //===----------------------------------------------------------------------===//
 //
-// These classes wrap target description classes used by the various code
-// generation TableGen backends.  This makes it easier to access the data and
-// provides a single place that needs to check it for validity.  All of these
-// classes throw exceptions on error conditions.
+// This file defines wrappers for the Target class and related global
+// functionality.  This makes it easier to access the data and provides a single
+// place that needs to check it for validity.  All of these classes throw
+// exceptions on error conditions.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef CODEGENWRAPPERS_H
-#define CODEGENWRAPPERS_H
+#ifndef CODEGEN_TARGET_H
+#define CODEGEN_TARGET_H
 
 #include "llvm/CodeGen/ValueTypes.h"
 #include <iosfwd>
diff --git a/llvm/utils/TableGen/InstrInfoEmitter.cpp b/llvm/utils/TableGen/InstrInfoEmitter.cpp
index d2a35370999..a1c1984f3da 100644
--- a/llvm/utils/TableGen/InstrInfoEmitter.cpp
+++ b/llvm/utils/TableGen/InstrInfoEmitter.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "InstrInfoEmitter.h"
-#include "CodeGenWrappers.h"
+#include "CodeGenTarget.h"
 #include "Record.h"
 using namespace llvm;
 
diff --git a/llvm/utils/TableGen/InstrSelectorEmitter.cpp b/llvm/utils/TableGen/InstrSelectorEmitter.cpp
index d6f9c0a4de7..5fb83c87555 100644
--- a/llvm/utils/TableGen/InstrSelectorEmitter.cpp
+++ b/llvm/utils/TableGen/InstrSelectorEmitter.cpp
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "InstrSelectorEmitter.h"
-#include "CodeGenWrappers.h"
 #include "Record.h"
 #include "Support/Debug.h"
 #include "Support/StringExtras.h"
diff --git a/llvm/utils/TableGen/InstrSelectorEmitter.h b/llvm/utils/TableGen/InstrSelectorEmitter.h
index a0fbbcf4080..156e7222b76 100644
--- a/llvm/utils/TableGen/InstrSelectorEmitter.h
+++ b/llvm/utils/TableGen/InstrSelectorEmitter.h
@@ -16,7 +16,7 @@
 #define INSTRSELECTOR_EMITTER_H
 
 #include "TableGenBackend.h"
-#include "CodeGenWrappers.h"
+#include "CodeGenTarget.h"
 #include <vector>
 #include <map>
 #include <cassert>
diff --git a/llvm/utils/TableGen/RegisterInfoEmitter.cpp b/llvm/utils/TableGen/RegisterInfoEmitter.cpp
index 8fd0e165531..6dd2d7779f5 100644
--- a/llvm/utils/TableGen/RegisterInfoEmitter.cpp
+++ b/llvm/utils/TableGen/RegisterInfoEmitter.cpp
@@ -14,7 +14,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "RegisterInfoEmitter.h"
-#include "CodeGenWrappers.h"
+#include "CodeGenTarget.h"
 #include "Record.h"
 #include "Support/StringExtras.h"
 #include <set>