Revert "Implement global merge optimization for global variables."

[oota-llvm.git] / lib / CodeGen / AsmPrinter / AsmPrinter.cpp

diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 0c4865f2f274a79541c14f0fb6b2e0f6d4e11b07..37a2c3220cb79b6a9dc5c39dc4c0e08a4af48d76 100644 (file)
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -946,11 +946,8 @@ bool AsmPrinter::doFinalization(Module &M) {
       EmitVisibility(Name, Alias.getVisibility());
 
       // Emit the directives as assignments aka .set:
-      const MCExpr *Expr = MCSymbolRefExpr::Create(Target, OutContext);
-      if (uint64_t Offset = Alias.calculateOffset(*TM.getDataLayout()))
-        Expr = MCBinaryExpr::CreateAdd(Expr,
-                 MCConstantExpr::Create(Offset, OutContext), OutContext);
-      OutStreamer.EmitAssignment(Name, Expr);
+      OutStreamer.EmitAssignment(Name,
+                                 MCSymbolRefExpr::Create(Target, OutContext));
     }
   }