Print alignment in decimal instead of hexadecimal.

[ruiu]

Summary

Previously, we were printing out something like this for
sections/symbols with alignment 16

0000000000201000 0000000000000182    10 .data

which I think confusing. I think printing it in decimal is
better.

[pcc]

Can you please make the same change to the COFF linker?

[ruiu]

Made the same change to COFF.

lld/trunk/COFF/MapFile.cpp

 using namespace llvm;
 using namespace llvm::object;
 
 using namespace lld;
 using namespace lld::coff;
 
 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);
 }
 
 static void writeInSecLine(raw_fd_ostream &OS, uint64_t Address, uint64_t Size,
                            uint64_t Align, StringRef Name) {
   // Pass an empty name to align the text to the correct column.
   writeOutSecLine(OS, Address, Size, Align, "");
   OS << ' ' << left_justify(Name, 7);

lld/trunk/ELF/MapFile.cpp

 using namespace llvm;
 using namespace llvm::object;
 
 using namespace lld;
 using namespace lld::elf;
 
 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);
 }
 
 static void writeInSecLine(raw_fd_ostream &OS, int Width, uint64_t Address,
                            uint64_t Size, uint64_t Align, StringRef Name) {
   // Pass an empty name to align the text to the correct column.
   writeOutSecLine(OS, Width, Address, Size, Align, "");
   OS << ' ' << left_justify(Name, 7);

lld/trunk/test/COFF/lldmap.test

 # RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main /lldmap:%T/foo.map %t.obj
 # RUN: FileCheck %s < %T/foo.map
 # RUN: lld-link /out:%T/bar.exe /entry:main /lldmap %t.obj
 # 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   

lld/trunk/test/ELF/map-file.s

 .cfi_startproc
 .cfi_endproc
 nop
 .weak bar
 bar:
 .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
 // CHECK-NEXT: 0000000000201000 0000000000000015     4 .text
 // CHECK-NEXT: 0000000000201000 000000000000000e     4         .text
 // CHECK-NEXT: 0000000000201000 000000000000000e     4                 {{.*}}{{/|\\}}map-file.s.tmp1.o
 // CHECK-NEXT: 000000000020100e 0000000000000000     0                         local
 // CHECK-NEXT: 0000000000201005 0000000000000000     0                         f(int)
 // CHECK-NEXT: 0000000000201000 0000000000000000     0                         _start
 // CHECK-NEXT: 0000000000201010 0000000000000002     4                 {{.*}}{{/|\\}}map-file.s.tmp2.o
 // CHECK-NEXT: 0000000000201010 0000000000000000     0                         foo
 // CHECK-NEXT: 0000000000201011 0000000000000000     0                         bar
 // CHECK-NEXT: 0000000000201012 0000000000000000     1         .text.zed
 // CHECK-NEXT: 0000000000201012 0000000000000000     1                 {{.*}}{{/|\\}}map-file.s.tmp2.o
 // CHECK-NEXT: 0000000000201012 0000000000000000     0                         zed
 // CHECK-NEXT: 0000000000201014 0000000000000000     4         .text
 // CHECK-NEXT: 0000000000201014 0000000000000000     4                 {{.*}}{{/|\\}}map-file.s.tmp3.o
 // 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
 // CHECK-NEXT: 0000000000000000 0000000000000039     1 .shstrtab
 // CHECK-NEXT: 0000000000000000 0000000000000039     1         .shstrtab
 // CHECK-NEXT: 0000000000000000 000000000000002f     1 .strtab
 // CHECK-NEXT: 0000000000000000 000000000000002f     1         .strtab
 
 // RUN: not ld.lld %t1.o %t2.o %t3.o %t4.a -o %t -Map=/ 2>&1 \
 // RUN:  | FileCheck -check-prefix=FAIL %s
 // FAIL: cannot open /