Index: llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
===================================================================
--- llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
+++ llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
@@ -78,7 +78,8 @@
     // Once we have this AggBuffer setup, we can choose how to print
     // it out.
   public:
-    unsigned numSymbols;   // number of symbol addresses
+    // number of symbol addresses
+    unsigned numSymbols() const { return Symbols.size(); }
 
   private:
     const unsigned size;   // size of the buffer in bytes
@@ -102,7 +103,6 @@
     AggBuffer(unsigned size, raw_ostream &O, NVPTXAsmPrinter &AP)
         : size(size), buffer(size), O(O), AP(AP) {
       curpos = 0;
-      numSymbols = 0;
       EmitGeneric = AP.EmitGeneric;
     }
 
@@ -135,63 +135,10 @@
       symbolPosInBuffer.push_back(curpos);
       Symbols.push_back(GVar);
       SymbolsBeforeStripping.push_back(GVarBeforeStripping);
-      numSymbols++;
     }
 
-    void print() {
-      if (numSymbols == 0) {
-        // print out in bytes
-        for (unsigned i = 0; i < size; i++) {
-          if (i)
-            O << ", ";
-          O << (unsigned int) buffer[i];
-        }
-      } else {
-        // print out in 4-bytes or 8-bytes
-        unsigned int pos = 0;
-        unsigned int nSym = 0;
-        unsigned int nextSymbolPos = symbolPosInBuffer[nSym];
-        unsigned int nBytes = 4;
-        if (static_cast<const NVPTXTargetMachine &>(AP.TM).is64Bit())
-          nBytes = 8;
-        for (pos = 0; pos < size; pos += nBytes) {
-          if (pos)
-            O << ", ";
-          if (pos == nextSymbolPos) {
-            const Value *v = Symbols[nSym];
-            const Value *v0 = SymbolsBeforeStripping[nSym];
-            if (const GlobalValue *GVar = dyn_cast<GlobalValue>(v)) {
-              MCSymbol *Name = AP.getSymbol(GVar);
-              PointerType *PTy = dyn_cast<PointerType>(v0->getType());
-              bool IsNonGenericPointer = false; // Is v0 a non-generic pointer?
-              if (PTy && PTy->getAddressSpace() != 0) {
-                IsNonGenericPointer = true;
-              }
-              if (EmitGeneric && !isa<Function>(v) && !IsNonGenericPointer) {
-                O << "generic(";
-                Name->print(O, AP.MAI);
-                O << ")";
-              } else {
-                Name->print(O, AP.MAI);
-              }
-            } else if (const ConstantExpr *CExpr = dyn_cast<ConstantExpr>(v0)) {
-              const MCExpr *Expr =
-                AP.lowerConstantForGV(cast<Constant>(CExpr), false);
-              AP.printMCExpr(*Expr, O);
-            } else
-              llvm_unreachable("symbol type unknown");
-            nSym++;
-            if (nSym >= numSymbols)
-              nextSymbolPos = size + 1;
-            else
-              nextSymbolPos = symbolPosInBuffer[nSym];
-          } else if (nBytes == 4)
-            O << *(unsigned int *)(&buffer[pos]);
-          else
-            O << *(unsigned long long *)(&buffer[pos]);
-        }
-      }
-    }
+    void printInBytes();
+    void printInWords();
   };
 
   friend class AggBuffer;
Index: llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
===================================================================
--- llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
+++ llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
@@ -1167,29 +1167,20 @@
         if (!isa<UndefValue>(Initializer) && !Initializer->isNullValue()) {
           AggBuffer aggBuffer(ElementSize, O, *this);
           bufferAggregateConstant(Initializer, &aggBuffer);
-          if (aggBuffer.numSymbols) {
-            if (static_cast<const NVPTXTargetMachine &>(TM).is64Bit()) {
-              O << " .u64 ";
-              getSymbol(GVar)->print(O, MAI);
-              O << "[";
-              O << ElementSize / 8;
-            } else {
-              O << " .u32 ";
-              getSymbol(GVar)->print(O, MAI);
-              O << "[";
-              O << ElementSize / 4;
-            }
-            O << "]";
+          if (aggBuffer.numSymbols()) {
+            unsigned int ptrSize = MAI->getCodePointerSize();
+            O << " .u" << ptrSize * 8 << " ";
+            getSymbol(GVar)->print(O, MAI);
+            O << "[" << ElementSize / ptrSize << "] = {";
+            aggBuffer.printInWords();
+            O << "}";
           } else {
             O << " .b8 ";
             getSymbol(GVar)->print(O, MAI);
-            O << "[";
-            O << ElementSize;
-            O << "]";
+            O << "[" << ElementSize << "] = {";
+            aggBuffer.printInBytes();
+            O << "}";
           }
-          O << " = {";
-          aggBuffer.print();
-          O << "}";
         } else {
           O << " .b8 ";
           getSymbol(GVar)->print(O, MAI);
@@ -1216,6 +1207,54 @@
   O << ";\n";
 }
 
+void NVPTXAsmPrinter::AggBuffer::printInBytes() {
+  for (unsigned int pos = 0; pos < size; ++pos) {
+    if (pos)
+      O << ", ";
+    O << (unsigned int)buffer[pos];
+  }
+}
+
+void NVPTXAsmPrinter::AggBuffer::printInWords() {
+  unsigned int ptrSize = AP.MAI->getCodePointerSize();
+  symbolPosInBuffer.push_back(size);
+  unsigned int nSym = 0;
+  unsigned int nextSymbolPos = symbolPosInBuffer[nSym];
+  assert(nextSymbolPos % ptrSize == 0);
+  for (unsigned int pos = 0; pos < size; pos += ptrSize) {
+    if (pos)
+      O << ", ";
+    if (pos == nextSymbolPos) {
+      const Value *v = Symbols[nSym];
+      const Value *v0 = SymbolsBeforeStripping[nSym];
+      if (const GlobalValue *GVar = dyn_cast<GlobalValue>(v)) {
+        MCSymbol *Name = AP.getSymbol(GVar);
+        PointerType *PTy = dyn_cast<PointerType>(v0->getType());
+        // Is v0 a non-generic pointer?
+        bool isNonGenericPointer = PTy && PTy->getAddressSpace() != 0;
+        if (EmitGeneric && !isa<Function>(v) && !isNonGenericPointer) {
+          O << "generic(";
+          Name->print(O, AP.MAI);
+          O << ")";
+        } else {
+          Name->print(O, AP.MAI);
+        }
+      } else if (const ConstantExpr *CExpr = dyn_cast<ConstantExpr>(v0)) {
+        const MCExpr *Expr =
+            AP.lowerConstantForGV(cast<Constant>(CExpr), false);
+        AP.printMCExpr(*Expr, O);
+      } else
+        llvm_unreachable("symbol type unknown");
+      nextSymbolPos = symbolPosInBuffer[++nSym];
+      assert(nextSymbolPos % ptrSize == 0);
+      assert(nextSymbolPos >= pos + ptrSize);
+    } else if (ptrSize == 4)
+      O << *(uint32_t *)(&buffer[pos]);
+    else
+      O << *(uint64_t *)(&buffer[pos]);
+  }
+}
+
 void NVPTXAsmPrinter::emitDemotedVars(const Function *f, raw_ostream &O) {
   if (localDecls.find(f) == localDecls.end())
     return;