4 files changed, 11 insertions, 44 deletions
diff --git a/include/llvm/MC/MCAtom.h b/include/llvm/MC/MCAtom.h
deleted file mode 100644
index f91a96f7c2..0000000000
--- a/include/llvm/MC/MCAtom.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//===- MCAtom.h - Machine Code Atoms ----------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_MC_MCATOM_H
-#define LLVM_MC_MCATOM_H
-
-namespace llvm {
-
-  class MCAtom {
-    MCSection *Section;
-
-  public:
-    MCAtom(MCSection *_Section) : Section(_Section) {}
-
-    MCSection *getSection() { return Section; }
-  };
-
-} // end namespace llvm
-
-#endif
diff --git a/include/llvm/MC/MCContext.h b/include/llvm/MC/MCContext.h
index 8dabb45e9a..13180e87ca 100644
--- a/include/llvm/MC/MCContext.h
+++ b/include/llvm/MC/MCContext.h
@@ -15,7 +15,6 @@
 #include "llvm/Support/Allocator.h"
 
 namespace llvm {
-  class MCAtom;
   class MCValue;
   class MCSection;
   class MCSymbol;
@@ -47,14 +46,10 @@ namespace llvm {
     /// GetSection - Get or create a new section with the given @param Name.
     MCSection *GetSection(const char *Name);
     
-    /// CreateAtom - Create a new atom inside @param Section.
-    MCAtom *CreateAtom(MCSection *Section);
-
-    /// CreateSymbol - Create a new symbol inside @param Atom with the specified
-    /// @param Name.
+    /// CreateSymbol - Create a new symbol with the specified @param Name.
     ///
     /// @param Name - The symbol name, which must be unique across all symbols.
-    MCSymbol *CreateSymbol(MCAtom *Atom, const char *Name);
+    MCSymbol *CreateSymbol(const char *Name);
 
     /// GetOrCreateSymbol - Lookup the symbol inside with the specified
     /// @param Name.  If it exists, return it.  If not, create a forward
@@ -63,13 +58,13 @@ namespace llvm {
     /// @param Name - The symbol name, which must be unique across all symbols.
     MCSymbol *GetOrCreateSymbol(const char *Name);
     
-    /// CreateTemporarySymbol - Create a new temporary symbol inside @param Atom
-    /// with the specified @param Name.
+    /// CreateTemporarySymbol - Create a new temporary symbol with the specified
+    /// @param Name.
     ///
     /// @param Name - The symbol name, for debugging purposes only, temporary
     /// symbols do not surive assembly. If non-empty the name must be unique
     /// across all symbols.
-    MCSymbol *CreateTemporarySymbol(MCAtom *Atom, const char *Name = "");
+    MCSymbol *CreateTemporarySymbol(const char *Name = "");
 
     /// LookupSymbol - Get the symbol for @param Name, or null.
     MCSymbol *LookupSymbol(const char *Name) const;
diff --git a/include/llvm/MC/MCStreamer.h b/include/llvm/MC/MCStreamer.h
index 76374160e8..0ce8113d06 100644
--- a/include/llvm/MC/MCStreamer.h
+++ b/include/llvm/MC/MCStreamer.h
@@ -11,7 +11,6 @@
 #define LLVM_MC_MCSTREAMER_H
 
 namespace llvm {
-  class MCAtom;
   class MCContext;
   class MCValue;
   class MCInst;
diff --git a/include/llvm/MC/MCSymbol.h b/include/llvm/MC/MCSymbol.h
index 085f765caf..06f50aebed 100644
--- a/include/llvm/MC/MCSymbol.h
+++ b/include/llvm/MC/MCSymbol.h
@@ -13,20 +13,19 @@
 #include <string>
 
 namespace llvm {
-  class MCAtom;
-
   class MCSymbol {
-    MCAtom *Atom;
+    MCSection *Section;
     std::string Name;
     unsigned IsTemporary : 1;
 
   public:
-    MCSymbol(MCAtom *_Atom, const char *_Name, bool _IsTemporary) 
-      : Atom(_Atom), Name(_Name), IsTemporary(_IsTemporary) {}
+    MCSymbol(const char *_Name, bool _IsTemporary) 
+      : Section(0), Name(_Name), IsTemporary(_IsTemporary) {}
 
-    MCAtom *getAtom() { return Atom; }
+    MCSection *getSection() const { return Section; }
+    void setSection(MCSection *Value) { Section = Value; }
 
-    const std::string &getName() { return Name; }
+    const std::string &getName() const { return Name; }
   };
 
 } // end namespace llvm