Index: lld/trunk/COFF/MapFile.cpp
===================================================================
--- lld/trunk/COFF/MapFile.cpp
+++ lld/trunk/COFF/MapFile.cpp
@@ -36,7 +36,7 @@
 
 static void writeOutSecLine(raw_fd_ostream &OS, uint64_t Address, uint64_t Size,
                             uint64_t Align, StringRef Name) {
-  OS << format("%08llx %08llx %5llx ", Address, Size, Align)
+  OS << format("%08llx %08llx %5lld ", Address, Size, Align)
      << left_justify(Name, 7);
 }
 
Index: lld/trunk/ELF/MapFile.cpp
===================================================================
--- lld/trunk/ELF/MapFile.cpp
+++ lld/trunk/ELF/MapFile.cpp
@@ -35,7 +35,7 @@
 
 static void writeOutSecLine(raw_fd_ostream &OS, int Width, uint64_t Address,
                             uint64_t Size, uint64_t Align, StringRef Name) {
-  OS << format("%0*llx %0*llx %5llx ", Width, Address, Width, Size, Align)
+  OS << format("%0*llx %0*llx %5lld ", Width, Address, Width, Size, Align)
      << left_justify(Name, 7);
 }
 
Index: lld/trunk/test/COFF/lldmap.test
===================================================================
--- lld/trunk/test/COFF/lldmap.test
+++ lld/trunk/test/COFF/lldmap.test
@@ -5,7 +5,7 @@
 # RUN: FileCheck %s < %T/bar.map
 
 # CHECK:      Address  Size     Align Out     In      File    Symbol
-# CHECK-NEXT: 00001000 00000006  1000 .text  
-# CHECK-NEXT: 00001000 00000006    10         .text$mn
-# CHECK-NEXT: 00001000 00000006    10                 {{.*}}lldmap.test.tmp.obj
+# CHECK-NEXT: 00001000 00000006  4096 .text
+# CHECK-NEXT: 00001000 00000006    16         .text$mn
+# CHECK-NEXT: 00001000 00000006    16                 {{.*}}lldmap.test.tmp.obj
 # CHECK-NEXT: 00001000 00000006     0                         main   
Index: lld/trunk/test/ELF/map-file.s
===================================================================
--- lld/trunk/test/ELF/map-file.s
+++ lld/trunk/test/ELF/map-file.s
@@ -24,7 +24,7 @@
 .long bar - .
 .long zed - .
 local:
-.comm   common,4,4
+.comm   common,4,16
 
 // CHECK:      Address          Size             Align Out     In      File    Symbol
 // CHECK-NEXT: 0000000000200158 0000000000000030     8 .eh_frame
@@ -45,8 +45,8 @@
 // CHECK-NEXT: 0000000000201014 0000000000000000     0                         bah
 // CHECK-NEXT: 0000000000201014 0000000000000001     4                 {{.*}}{{/|\\}}map-file.s.tmp4.a(map-file.s.tmp4.o)
 // CHECK-NEXT: 0000000000201014 0000000000000000     0                         baz
-// CHECK-NEXT: 0000000000202000 0000000000000004     4 .bss
-// CHECK-NEXT: 0000000000202000 0000000000000004     4         COMMON
+// CHECK-NEXT: 0000000000202000 0000000000000004    16 .bss
+// CHECK-NEXT: 0000000000202000 0000000000000004    16         COMMON
 // CHECK-NEXT: 0000000000000000 0000000000000008     1 .comment
 // CHECK-NEXT: 0000000000000000 00000000000000f0     8 .symtab
 // CHECK-NEXT: 0000000000000000 00000000000000f0     8         .symtab