[llvm-commits] [llvm] r75108 - /llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp

[Chris Lattner]

Author: lattner
Date: Thu Jul  9 00:42:07 2009
New Revision: 75108

URL: http://llvm.org/viewvc/llvm-project?rev=75108&view=rev
Log:
various minor cleanups, no functionality change.

Modified:
    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=75108&r1=75107&r2=75108&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Thu Jul  9 00:42:07 2009
@@ -428,6 +428,10 @@
       needCloseParen = true;
     }
 
+    // Handle dllimport linkage.
+    if (MO.getTargetFlags() == X86II::MO_DLLIMPORT)
+      O << "__imp_";
+    
     if (Subtarget->isPICStyleStub()) {
       // DARWIN/X86-32 in != static mode.
 
@@ -457,24 +461,20 @@
         PrintPICBaseSymbol();
       }        
     } else {
-      // Handle dllimport linkage.
-      if (MO.getTargetFlags() == X86II::MO_DLLIMPORT)
-        O << "__imp_";
       O << Name;
     }
 
-    printOffset(MO.getOffset());
-
     if (needCloseParen)
       O << ')';
     
+    printOffset(MO.getOffset());
     break;
   }
   case MachineOperand::MO_ExternalSymbol:
     /// NOTE: MO_ExternalSymbol in a non-pcrel_imm context is *only* generated
     /// by _GLOBAL_OFFSET_TABLE_ on X86-32.  All others are call operands, which
     /// are pcrel_imm's.
-    assert(!Subtarget->is64Bit() && !Subtarget->isPICStyleRIPRel());
+    assert(!Subtarget->is64Bit());
     // These are never used as memory operands.
     assert(Modifier == 0 || strcmp(Modifier, "mem"));
     O << '$';