[lld] r233222 - YAML: Do not use 2^x notation to represent alignments.

Rui Ueyama ruiu at google.com
Wed Mar 25 15:06:05 PDT 2015


Author: ruiu
Date: Wed Mar 25 17:06:04 2015
New Revision: 233222

URL: http://llvm.org/viewvc/llvm-project?rev=233222&view=rev
Log:
YAML: Do not use 2^x notation to represent alignments.

Modified:
    lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
    lld/trunk/test/elf/Hexagon/dynlib-gotoff.test
    lld/trunk/test/elf/Mips/ctors-order.test
    lld/trunk/test/elf/Mips/dynlib-dynsym-micro.test
    lld/trunk/test/elf/Mips/dynlib-dynsym.test
    lld/trunk/test/elf/Mips/exe-dynsym-micro.test
    lld/trunk/test/elf/Mips/exe-dynsym.test
    lld/trunk/test/elf/Mips/exe-got-micro.test
    lld/trunk/test/elf/Mips/exe-got.test
    lld/trunk/test/elf/Mips/got16-micro.test
    lld/trunk/test/elf/Mips/got16.test
    lld/trunk/test/elf/X86_64/extern-tls.test
    lld/trunk/test/elf/X86_64/multi-weak-layout.test
    lld/trunk/test/elf/X86_64/weak-zero-sized.test
    lld/trunk/test/elf/allowduplicates.objtxt
    lld/trunk/test/elf/defsym.objtxt
    lld/trunk/test/elf/entry.objtxt
    lld/trunk/test/elf/linkerscript/externs.objtxt
    lld/trunk/test/elf/linkerscript/valid-script-cli.objtxt
    lld/trunk/test/elf/mergeconstants.test
    lld/trunk/test/elf/reloc.test
    lld/trunk/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test
    lld/trunk/test/elf/x86-64-dynamic-relocs.test
    lld/trunk/test/elf/x86-64-dynamic.test
    lld/trunk/test/mach-o/align_text.yaml
    lld/trunk/test/mach-o/parse-tentative-defs.yaml

Modified: lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp (original)
+++ lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp Wed Mar 25 17:06:04 2015
@@ -478,15 +478,15 @@ struct ScalarEnumerationTraits<lld::Shar
 
 /// This is a custom formatter for lld::DefinedAtom::Alignment.  Values look
 /// like:
-///     2^3          # 8-byte aligned
-///     7 mod 2^4    # 16-byte aligned plus 7 bytes
+///     8           # 8-byte aligned
+///     7 mod 16    # 16-byte aligned plus 7 bytes
 template <> struct ScalarTraits<lld::DefinedAtom::Alignment> {
   static void output(const lld::DefinedAtom::Alignment &value, void *ctxt,
                      raw_ostream &out) {
     if (value.modulus == 0) {
-      out << llvm::format("2^%d", value.powerOf2);
+      out << llvm::format("%d", 1U << value.powerOf2);
     } else {
-      out << llvm::format("%d mod 2^%d", value.modulus, value.powerOf2);
+      out << llvm::format("%d mod %d", value.modulus, 1U << value.powerOf2);
     }
   }
 
@@ -505,16 +505,12 @@ template <> struct ScalarTraits<lld::Def
       scalar = scalar.drop_front(modStart + 3);
       scalar = scalar.ltrim();
     }
-    if (!scalar.startswith("2^")) {
-      return "malformed alignment";
-    }
-    StringRef powerStr = scalar.drop_front(2);
     unsigned int power;
-    if (powerStr.getAsInteger(0, power)) {
+    if (scalar.getAsInteger(0, power)) {
       return "malformed alignment power";
     }
-    value.powerOf2 = power;
-    if (value.modulus > (1 << value.powerOf2)) {
+    value.powerOf2 = llvm::Log2_64(power);
+    if (value.modulus >= power) {
       return "malformed alignment, modulus too large for power";
     }
     return StringRef(); // returning empty string means success

Modified: lld/trunk/test/elf/Hexagon/dynlib-gotoff.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Hexagon/dynlib-gotoff.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/Hexagon/dynlib-gotoff.test (original)
+++ lld/trunk/test/elf/Hexagon/dynlib-gotoff.test Wed Mar 25 17:06:04 2015
@@ -8,7 +8,7 @@ CHECKGOTPLT:    type:            stub
 CHECKGOTPLT:    content:         [ 00, 40, 00, 00, 1C, C0, 49, 6A, 0E, 42, 9C, E2,
 CHECKGOTPLT:                       4F, 40, 9C, 91, 3C, C0, 9C, 91, 0E, 42, 0E, 8C,
 CHECKGOTPLT:                       00, C0, 9C, 52 ]
-CHECKGOTPLT:    alignment:       2^4
+CHECKGOTPLT:    alignment:       16
 CHECKGOTPLT:    section-name:    .plt
 CHECKGOTPLT:    references:
 CHECKGOTPLT:      - kind:            R_HEX_B32_PCREL_X
@@ -22,7 +22,7 @@ CHECKGOTPLT:        addend:          4
 CHECKGOTPLT:    type:            stub
 CHECKGOTPLT:    content:         [ 00, 40, 00, 00, 0E, C0, 49, 6A, 1C, C0, 8E, 91,
 CHECKGOTPLT:                       00, C0, 9C, 52 ]
-CHECKGOTPLT:    alignment:       2^4
+CHECKGOTPLT:    alignment:       16
 CHECKGOTPLT:    section-name:    .plt
 CHECKGOTPLT:    references:
 CHECKGOTPLT:      - kind:            R_HEX_B32_PCREL_X
@@ -36,7 +36,7 @@ CHECKGOTPLT:        addend:          4
 CHECKGOTPLT:    type:            stub
 CHECKGOTPLT:    content:         [ 00, 40, 00, 00, 0E, C0, 49, 6A, 1C, C0, 8E, 91,
 CHECKGOTPLT:                       00, C0, 9C, 52 ]
-CHECKGOTPLT:    alignment:       2^4
+CHECKGOTPLT:    alignment:       16
 CHECKGOTPLT:    section-name:    .plt
 CHECKGOTPLT:    references:
 CHECKGOTPLT:      - kind:            R_HEX_B32_PCREL_X
@@ -50,7 +50,7 @@ CHECKGOTPLT:        addend:          4
 CHECKGOTPLT:    type:            stub
 CHECKGOTPLT:    content:         [ 00, 40, 00, 00, 0E, C0, 49, 6A, 1C, C0, 8E, 91,
 CHECKGOTPLT:                       00, C0, 9C, 52 ]
-CHECKGOTPLT:    alignment:       2^4
+CHECKGOTPLT:    alignment:       16
 CHECKGOTPLT:    section-name:    .plt
 CHECKGOTPLT:    references:
 CHECKGOTPLT:      - kind:            R_HEX_B32_PCREL_X
@@ -64,13 +64,13 @@ CHECKGOTPLT:        addend:          4
 CHECKGOTPLT:    type:            got
 CHECKGOTPLT:    content:         [ 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
 CHECKGOTPLT:                       00, 00, 00, 00 ]
-CHECKGOTPLT:    alignment:       2^3
+CHECKGOTPLT:    alignment:       8
 CHECKGOTPLT:    section-name:    .got.plt
 CHECKGOTPLT:    permissions:     rw-
               - name:            __got_c
 CHECKGOTPLT:    type:            got
 CHECKGOTPLT:    content:         [ 00, 00, 00, 00 ]
-CHECKGOTPLT:    alignment:       2^2
+CHECKGOTPLT:    alignment:       4
 CHECKGOTPLT:    section-name:    .got
 CHECKGOTPLT:    permissions:     rw-
 CHECKGOTPLT:    references:
@@ -80,7 +80,7 @@ CHECKGOTPLT:        target:          c
               - name:            __got_shankar
 CHECKGOTPLT:    type:            got
 CHECKGOTPLT:    content:         [ 00, 00, 00, 00 ]
-CHECKGOTPLT:    alignment:       2^2
+CHECKGOTPLT:    alignment:       4
 CHECKGOTPLT:    section-name:    .got
 CHECKGOTPLT:    permissions:     rw-
 CHECKGOTPLT:    references:
@@ -90,7 +90,7 @@ CHECKGOTPLT:        target:          sha
               - name:            __got_fn
 CHECKGOTPLT:    type:            got
 CHECKGOTPLT:    content:         [ 00, 00, 00, 00 ]
-CHECKGOTPLT:    alignment:       2^2
+CHECKGOTPLT:    alignment:       4
 CHECKGOTPLT:    section-name:    .got.plt
 CHECKGOTPLT:    permissions:     rw-
 CHECKGOTPLT:    references:
@@ -103,7 +103,7 @@ CHECKGOTPLT:        offset:          0
               - name:            __got_fn1
 CHECKGOTPLT:    type:            got
 CHECKGOTPLT:    content:         [ 00, 00, 00, 00 ]
-CHECKGOTPLT:    alignment:       2^2
+CHECKGOTPLT:    alignment:       4
 CHECKGOTPLT:    section-name:    .got.plt
 CHECKGOTPLT:    permissions:     rw-
 CHECKGOTPLT:    references:
@@ -116,7 +116,7 @@ CHECKGOTPLT:        offset:          0
               - name:            __got_fn2
 CHECKGOTPLT:    type:            got
 CHECKGOTPLT:    content:         [ 00, 00, 00, 00 ]
-CHECKGOTPLT:    alignment:       2^2
+CHECKGOTPLT:    alignment:       4
 CHECKGOTPLT:    section-name:    .got.plt
 CHECKGOTPLT:    permissions:     rw-
 CHECKGOTPLT:    references:

Modified: lld/trunk/test/elf/Mips/ctors-order.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/ctors-order.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/ctors-order.test (original)
+++ lld/trunk/test/elf/Mips/ctors-order.test Wed Mar 25 17:06:04 2015
@@ -11,7 +11,7 @@
 
 # CHECK:      defined-atoms:
 # CHECK-NEXT:   - type:            data
-# CHECK-NEXT:     alignment:       2^2
+# CHECK-NEXT:     alignment:       4
 # CHECK-NEXT:     section-choice:  custom-required
 # CHECK-NEXT:     section-name:    .ctors
 # CHECK-NEXT:     references:
@@ -21,22 +21,22 @@
 # CHECK-NEXT:   - name:            __CTOR_LIST__
 # CHECK-NEXT:     type:            data
 # CHECK-NEXT:     content:         [ FF, FF, FF, FF ]
-# CHECK-NEXT:     alignment:       2^2
+# CHECK-NEXT:     alignment:       4
 # CHECK-NEXT:     section-choice:  custom-required
 # CHECK-NEXT:     section-name:    .ctors
 # CHECK-NEXT:   - type:            data
 # CHECK-NEXT:     content:         [ 11, 11, 11, 11 ]
-# CHECK-NEXT:     alignment:       2^2
+# CHECK-NEXT:     alignment:       4
 # CHECK-NEXT:     section-choice:  custom-required
 # CHECK-NEXT:     section-name:    .ctors.1
 # CHECK-NEXT:   - type:            data
 # CHECK-NEXT:     content:         [ 22, 22, 22, 22 ]
-# CHECK-NEXT:     alignment:       2^2
+# CHECK-NEXT:     alignment:       4
 # CHECK-NEXT:     section-choice:  custom-required
 # CHECK-NEXT:     section-name:    .ctors.2
 # CHECK-NEXT:   - ref-name:        L003
 # CHECK-NEXT:     type:            data
-# CHECK-NEXT:     alignment:       2^2
+# CHECK-NEXT:     alignment:       4
 # CHECK-NEXT:     section-choice:  custom-required
 # CHECK-NEXT:     section-name:    .ctors
 # CHECK-NEXT:     references:
@@ -46,7 +46,7 @@
 # CHECK-NEXT:   - name:            __CTOR_END__
 # CHECK-NEXT:     type:            data
 # CHECK-NEXT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-NEXT:     alignment:       2^2
+# CHECK-NEXT:     alignment:       4
 # CHECK-NEXT:     section-choice:  custom-required
 # CHECK-NEXT:     section-name:    .ctors
 

Modified: lld/trunk/test/elf/Mips/dynlib-dynsym-micro.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/dynlib-dynsym-micro.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/dynlib-dynsym-micro.test (original)
+++ lld/trunk/test/elf/Mips/dynlib-dynsym-micro.test Wed Mar 25 17:06:04 2015
@@ -68,20 +68,20 @@
 
 # CHECK-GOT:   - type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
 # CHECK-GOT:   - type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 80 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
 # CHECK-GOT:   - ref-name:        L000
 # CHECK-GOT:     type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
@@ -92,7 +92,7 @@
 # CHECK-GOT:   - ref-name:        L002
 # CHECK-GOT:     type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
@@ -103,7 +103,7 @@
 # CHECK-GOT:   - ref-name:        L004
 # CHECK-GOT:     type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
@@ -114,7 +114,7 @@
 # CHECK-GOT:   - ref-name:        L005
 # CHECK-GOT:     type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
@@ -125,7 +125,7 @@
 # CHECK-GOT:   - ref-name:        L006
 # CHECK-GOT:     type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-

Modified: lld/trunk/test/elf/Mips/dynlib-dynsym.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/dynlib-dynsym.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/dynlib-dynsym.test (original)
+++ lld/trunk/test/elf/Mips/dynlib-dynsym.test Wed Mar 25 17:06:04 2015
@@ -64,20 +64,20 @@
 
 # CHECK-GOT:   - type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
 # CHECK-GOT:   - type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 80 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
 # CHECK-GOT:   - ref-name:        L000
 # CHECK-GOT:     type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
@@ -88,7 +88,7 @@
 # CHECK-GOT:   - ref-name:        L002
 # CHECK-GOT:     type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
@@ -99,7 +99,7 @@
 # CHECK-GOT:   - ref-name:        L004
 # CHECK-GOT:     type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
@@ -110,7 +110,7 @@
 # CHECK-GOT:   - ref-name:        L005
 # CHECK-GOT:     type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-
@@ -121,7 +121,7 @@
 # CHECK-GOT:   - ref-name:        L006
 # CHECK-GOT:     type:            got
 # CHECK-GOT:     content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:     alignment:       2^2
+# CHECK-GOT:     alignment:       4
 # CHECK-GOT:     section-choice:  custom-required
 # CHECK-GOT:     section-name:    .got
 # CHECK-GOT:     permissions:     rw-

Modified: lld/trunk/test/elf/Mips/exe-dynsym-micro.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/exe-dynsym-micro.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/exe-dynsym-micro.test (original)
+++ lld/trunk/test/elf/Mips/exe-dynsym-micro.test Wed Mar 25 17:06:04 2015
@@ -40,20 +40,20 @@
 
 # CHECK-GOT: - type:            got
 # CHECK-GOT:   content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:   alignment:       2^2
+# CHECK-GOT:   alignment:       4
 # CHECK-GOT:   section-choice:  custom-required
 # CHECK-GOT:   section-name:    .got
 # CHECK-GOT:   permissions:     rw-
 # CHECK-GOT: - type:            got
 # CHECK-GOT:   content:         [ 00, 00, 00, 80 ]
-# CHECK-GOT:   alignment:       2^2
+# CHECK-GOT:   alignment:       4
 # CHECK-GOT:   section-choice:  custom-required
 # CHECK-GOT:   section-name:    .got
 # CHECK-GOT:   permissions:     rw-
 # CHECK-GOT: - ref-name:        L000
 # CHECK-GOT:   type:            got
 # CHECK-GOT:   content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:   alignment:       2^2
+# CHECK-GOT:   alignment:       4
 # CHECK-GOT:   section-choice:  custom-required
 # CHECK-GOT:   section-name:    .got
 # CHECK-GOT:   permissions:     rw-

Modified: lld/trunk/test/elf/Mips/exe-dynsym.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/exe-dynsym.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/exe-dynsym.test (original)
+++ lld/trunk/test/elf/Mips/exe-dynsym.test Wed Mar 25 17:06:04 2015
@@ -38,20 +38,20 @@
 
 # CHECK-GOT: - type:            got
 # CHECK-GOT:   content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:   alignment:       2^2
+# CHECK-GOT:   alignment:       4
 # CHECK-GOT:   section-choice:  custom-required
 # CHECK-GOT:   section-name:    .got
 # CHECK-GOT:   permissions:     rw-
 # CHECK-GOT: - type:            got
 # CHECK-GOT:   content:         [ 00, 00, 00, 80 ]
-# CHECK-GOT:   alignment:       2^2
+# CHECK-GOT:   alignment:       4
 # CHECK-GOT:   section-choice:  custom-required
 # CHECK-GOT:   section-name:    .got
 # CHECK-GOT:   permissions:     rw-
 # CHECK-GOT: - ref-name:        L000
 # CHECK-GOT:   type:            got
 # CHECK-GOT:   content:         [ 00, 00, 00, 00 ]
-# CHECK-GOT:   alignment:       2^2
+# CHECK-GOT:   alignment:       4
 # CHECK-GOT:   section-choice:  custom-required
 # CHECK-GOT:   section-name:    .got
 # CHECK-GOT:   permissions:     rw-

Modified: lld/trunk/test/elf/Mips/exe-got-micro.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/exe-got-micro.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/exe-got-micro.test (original)
+++ lld/trunk/test/elf/Mips/exe-got-micro.test Wed Mar 25 17:06:04 2015
@@ -15,13 +15,13 @@
 # GOT header
 # GOT:   - type:            got
 # GOT:     content:         [ 00, 00, 00, 00 ]
-# GOT:     alignment:       2^2
+# GOT:     alignment:       4
 # GOT:     section-choice:  custom-required
 # GOT:     section-name:    .got
 # GOT:     permissions:     rw-
 # GOT:   - type:            got
 # GOT:     content:         [ 00, 00, 00, 80 ]
-# GOT:     alignment:       2^2
+# GOT:     alignment:       4
 # GOT:     section-choice:  custom-required
 # GOT:     section-name:    .got
 # GOT:     permissions:     rw-
@@ -29,7 +29,7 @@
 # GOT:   - ref-name:        L000
 # GOT:     type:            got
 # GOT:     content:         [ 00, 00, 00, 00 ]
-# GOT:     alignment:       2^2
+# GOT:     alignment:       4
 # GOT:     section-choice:  custom-required
 # GOT:     section-name:    .got
 # GOT:     permissions:     rw-
@@ -41,7 +41,7 @@
 # GOT:   - ref-name:        L001
 # GOT:     type:            got
 # GOT:     content:         [ 00, 00, 00, 00 ]
-# GOT:     alignment:       2^2
+# GOT:     alignment:       4
 # GOT:     section-choice:  custom-required
 # GOT:     section-name:    .got
 # GOT:     permissions:     rw-

Modified: lld/trunk/test/elf/Mips/exe-got.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/exe-got.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/exe-got.test (original)
+++ lld/trunk/test/elf/Mips/exe-got.test Wed Mar 25 17:06:04 2015
@@ -15,13 +15,13 @@
 # GOT header
 # GOT:   - type:            got
 # GOT:     content:         [ 00, 00, 00, 00 ]
-# GOT:     alignment:       2^2
+# GOT:     alignment:       4
 # GOT:     section-choice:  custom-required
 # GOT:     section-name:    .got
 # GOT:     permissions:     rw-
 # GOT:   - type:            got
 # GOT:     content:         [ 00, 00, 00, 80 ]
-# GOT:     alignment:       2^2
+# GOT:     alignment:       4
 # GOT:     section-choice:  custom-required
 # GOT:     section-name:    .got
 # GOT:     permissions:     rw-
@@ -29,7 +29,7 @@
 # GOT:   - ref-name:        L000
 # GOT:     type:            got
 # GOT:     content:         [ 00, 00, 00, 00 ]
-# GOT:     alignment:       2^2
+# GOT:     alignment:       4
 # GOT:     section-choice:  custom-required
 # GOT:     section-name:    .got
 # GOT:     permissions:     rw-
@@ -41,7 +41,7 @@
 # GOT:   - ref-name:        L001
 # GOT:     type:            got
 # GOT:     content:         [ 00, 00, 00, 00 ]
-# GOT:     alignment:       2^2
+# GOT:     alignment:       4
 # GOT:     section-choice:  custom-required
 # GOT:     section-name:    .got
 # GOT:     permissions:     rw-

Modified: lld/trunk/test/elf/Mips/got16-micro.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/got16-micro.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/got16-micro.test (original)
+++ lld/trunk/test/elf/Mips/got16-micro.test Wed Mar 25 17:06:04 2015
@@ -16,7 +16,7 @@
 # YAML:        content:      [ 5C, FC, 00, 00, 42, 30, 00, 00, 5C, FC, 00, 00,
 # YAML:                        42, 30, 00, 00, 5C, FC, 00, 00, 5C, FC, 00, 00,
 # YAML:                        5C, FC, 00, 00 ]
-# YAML:        alignment:    4 mod 2^4
+# YAML:        alignment:    4 mod 16
 # YAML:        code-model:   mips-micro
 # YAML:        references:
 # YAML-NEXT:     - kind:         R_MICROMIPS_GOT16
@@ -45,7 +45,7 @@
 # YAML:       - ref-name:        L000
 # YAML-NEXT:    type:            got
 # YAML-NEXT:    content:         [ 00, 00, 00, 00 ]
-# YAML-NEXT:    alignment:       2^2
+# YAML-NEXT:    alignment:       4
 # YAML-NEXT:    section-choice:  custom-required
 # YAML-NEXT:    section-name:    .got
 # YAML-NEXT:    permissions:     rw-
@@ -56,7 +56,7 @@
 # YAML-NEXT:  - ref-name:        L001
 # YAML-NEXT:    type:            got
 # YAML-NEXT:    content:         [ 00, 00, 00, 00 ]
-# YAML-NEXT:    alignment:       2^2
+# YAML-NEXT:    alignment:       4
 # YAML-NEXT:    section-choice:  custom-required
 # YAML-NEXT:    section-name:    .got
 # YAML-NEXT:    permissions:     rw-
@@ -67,7 +67,7 @@
 # YAML-NEXT:  - ref-name:        L002
 # YAML-NEXT:    type:            got
 # YAML-NEXT:    content:         [ 00, 00, 00, 00 ]
-# YAML-NEXT:    alignment:       2^2
+# YAML-NEXT:    alignment:       4
 # YAML-NEXT:    section-choice:  custom-required
 # YAML-NEXT:    section-name:    .got
 # YAML-NEXT:    permissions:     rw-
@@ -80,7 +80,7 @@
 # YAML-NEXT:  - ref-name:        L003
 # YAML-NEXT:    type:            got
 # YAML-NEXT:    content:         [ 00, 00, 00, 00 ]
-# YAML-NEXT:    alignment:       2^2
+# YAML-NEXT:    alignment:       4
 # YAML-NEXT:    section-choice:  custom-required
 # YAML-NEXT:    section-name:    .got
 # YAML-NEXT:    permissions:     rw-
@@ -94,7 +94,7 @@
 # YAML-NEXT:  - ref-name:        L004
 # YAML-NEXT:    type:            got
 # YAML-NEXT:    content:         [ 00, 00, 00, 00 ]
-# YAML-NEXT:    alignment:       2^2
+# YAML-NEXT:    alignment:       4
 # YAML-NEXT:    section-choice:  custom-required
 # YAML-NEXT:    section-name:    .got
 # YAML-NEXT:    permissions:     rw-

Modified: lld/trunk/test/elf/Mips/got16.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/got16.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/got16.test (original)
+++ lld/trunk/test/elf/Mips/got16.test Wed Mar 25 17:06:04 2015
@@ -14,7 +14,7 @@
 # YAML:    content:         [ 00, 00, 84, 8F, 00, 00, 84, 24, 01, 00, 84, 8F,
 # YAML:                       00, 02, 84, 24, 00, 00, 84, 8F, 00, 00, 84, 8F,
 # YAML:                       00, 00, 84, 8F ]
-# YAML:    alignment:       2^2
+# YAML:    alignment:       4
 # YAML:    references:
 # YAML:      - kind:            R_MIPS_GOT16
 # YAML:        offset:          0
@@ -44,7 +44,7 @@
 # YAML:       - ref-name:        L000
 # YAML-NEXT:    type:            got
 # YAML-NEXT:    content:         [ 00, 00, 00, 00 ]
-# YAML-NEXT:    alignment:       2^2
+# YAML-NEXT:    alignment:       4
 # YAML-NEXT:    section-choice:  custom-required
 # YAML-NEXT:    section-name:    .got
 # YAML-NEXT:    permissions:     rw-
@@ -55,7 +55,7 @@
 # YAML-NEXT:  - ref-name:        L002
 # YAML-NEXT:    type:            got
 # YAML-NEXT:    content:         [ 00, 00, 00, 00 ]
-# YAML-NEXT:    alignment:       2^2
+# YAML-NEXT:    alignment:       4
 # YAML-NEXT:    section-choice:  custom-required
 # YAML-NEXT:    section-name:    .got
 # YAML-NEXT:    permissions:     rw-
@@ -67,7 +67,7 @@
 # YAML-NEXT:  - ref-name:        L004
 # YAML-NEXT:    type:            got
 # YAML-NEXT:    content:         [ 00, 00, 00, 00 ]
-# YAML-NEXT:    alignment:       2^2
+# YAML-NEXT:    alignment:       4
 # YAML-NEXT:    section-choice:  custom-required
 # YAML-NEXT:    section-name:    .got
 # YAML-NEXT:    permissions:     rw-
@@ -80,7 +80,7 @@
 # YAML-NEXT:  - ref-name:        L005
 # YAML-NEXT:    type:            got
 # YAML-NEXT:    content:         [ 00, 00, 00, 00 ]
-# YAML-NEXT:    alignment:       2^2
+# YAML-NEXT:    alignment:       4
 # YAML-NEXT:    section-choice:  custom-required
 # YAML-NEXT:    section-name:    .got
 # YAML-NEXT:    permissions:     rw-
@@ -94,7 +94,7 @@
 # YAML-NEXT:  - ref-name:        L006
 # YAML-NEXT:    type:            got
 # YAML-NEXT:    content:         [ 00, 00, 00, 00 ]
-# YAML-NEXT:    alignment:       2^2
+# YAML-NEXT:    alignment:       4
 # YAML-NEXT:    section-choice:  custom-required
 # YAML-NEXT:    section-name:    .got
 # YAML-NEXT:    permissions:     rw-

Modified: lld/trunk/test/elf/X86_64/extern-tls.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/X86_64/extern-tls.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/X86_64/extern-tls.test (original)
+++ lld/trunk/test/elf/X86_64/extern-tls.test Wed Mar 25 17:06:04 2015
@@ -6,7 +6,7 @@ RUN: --output-filetype=yaml --noinhibit-
            - name:            __got_tls_extern_tls
 CHECKGOT:    type:            got
 CHECKGOT:    content:         [ 00, 00, 00, 00, 00, 00, 00, 00 ]
-CHECKGOT:    alignment:       2^3
+CHECKGOT:    alignment:       8
 CHECKGOT:    section-choice:  custom-required
 CHECKGOT:    section-name:    .got
 CHECKGOT:    permissions:     rw-

Modified: lld/trunk/test/elf/X86_64/multi-weak-layout.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/X86_64/multi-weak-layout.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/X86_64/multi-weak-layout.test (original)
+++ lld/trunk/test/elf/X86_64/multi-weak-layout.test Wed Mar 25 17:06:04 2015
@@ -6,7 +6,7 @@ RUN: --noinhibit-exec -static --output-f
 RUN: FileCheck %s -check-prefix=WEAKSYMS < %t
 
 WEAKSYMS:  - type:            data
-WEAKSYMS:    alignment:       2^3
+WEAKSYMS:    alignment:       8
 WEAKSYMS:    references:
 WEAKSYMS:      - kind:            layout-after
 WEAKSYMS:        offset:          0
@@ -15,7 +15,7 @@ WEAKSYMS:  - name:            myfn2
 WEAKSYMS:    scope:           global
 WEAKSYMS:    type:            data
 WEAKSYMS:    merge:           as-weak
-WEAKSYMS:    alignment:       2^3
+WEAKSYMS:    alignment:       8
 WEAKSYMS:    references:
 WEAKSYMS:      - kind:            layout-after
 WEAKSYMS:        offset:          0
@@ -24,7 +24,7 @@ WEAKSYMS:  - ref-name:        [[L001]]
 WEAKSYMS:    scope:           global
 WEAKSYMS:    type:            data
 WEAKSYMS:    content:         [ 00, 00, 00, 00, 00, 00, 00, 00 ]
-WEAKSYMS:    alignment:       2^3
+WEAKSYMS:    alignment:       8
 WEAKSYMS:    references:
 WEAKSYMS:      - kind:            R_X86_64_64
 WEAKSYMS:        offset:          0
@@ -36,7 +36,7 @@ WEAKSYMS:  - name:            myfn1
 WEAKSYMS:    scope:           global
 WEAKSYMS:    type:            data
 WEAKSYMS:    merge:           as-weak
-WEAKSYMS:    alignment:       2^3
+WEAKSYMS:    alignment:       8
 WEAKSYMS:    references:
 WEAKSYMS:      - kind:            layout-after
 WEAKSYMS:        offset:          0
@@ -45,7 +45,7 @@ WEAKSYMS:  - ref-name:        [[L003]]
 WEAKSYMS:    scope:           global
 WEAKSYMS:    type:            data
 WEAKSYMS:    content:         [ 00, 00, 00, 00, 00, 00, 00, 00 ]
-WEAKSYMS:    alignment:       2^3
+WEAKSYMS:    alignment:       8
 WEAKSYMS:    references:
 WEAKSYMS:      - kind:            R_X86_64_64
 WEAKSYMS:        offset:          0

Modified: lld/trunk/test/elf/X86_64/weak-zero-sized.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/X86_64/weak-zero-sized.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/X86_64/weak-zero-sized.test (original)
+++ lld/trunk/test/elf/X86_64/weak-zero-sized.test Wed Mar 25 17:06:04 2015
@@ -8,14 +8,14 @@ RUN: FileCheck -check-prefix=WEAKATOMSOR
 
 WEAKORDER: 004001a4 T _start
 
-WEAKATOMSORDER:    alignment:       2^2
+WEAKATOMSORDER:    alignment:       4
 WEAKATOMSORDER:      - kind:            layout-after
 WEAKATOMSORDER:        offset:          0
 WEAKATOMSORDER:        target:          [[TARGETC:[-a-zA-Z0-9_]+]]
 WEAKATOMSORDER:  - name:        [[TARGETA:[-a-zA-Z0-9_]+]]
 WEAKATOMSORDER:    scope:           global
 WEAKATOMSORDER:    merge:           as-weak
-WEAKATOMSORDER:    alignment:       2^2
+WEAKATOMSORDER:    alignment:       4
 WEAKATOMSORDER:    references:
 WEAKATOMSORDER:      - kind:            layout-after
 WEAKATOMSORDER:        offset:          0
@@ -23,4 +23,4 @@ WEAKATOMSORDER:        target:
 WEAKATOMSORDER:  - ref-name:        [[TARGETC]]
 WEAKATOMSORDER:    scope:           global
 WEAKATOMSORDER:    content:         [ C3 ]
-WEAKATOMSORDER:    alignment:       2^2
+WEAKATOMSORDER:    alignment:       4

Modified: lld/trunk/test/elf/allowduplicates.objtxt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/allowduplicates.objtxt?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/allowduplicates.objtxt (original)
+++ lld/trunk/test/elf/allowduplicates.objtxt Wed Mar 25 17:06:04 2015
@@ -10,41 +10,41 @@
 ---
 defined-atoms:
   - name:            .text
-    alignment:       2^4
+    alignment:       16
     section-choice:  custom-required
     section-name:    .text
   - name:            main
     scope:           global
     content:         [ B8, 00, 00, 00, 00, C7, 44, 24, FC, 00, 00, 00,
                        00, C3 ]
-    alignment:       2^4
+    alignment:       16
     section-choice:  custom-required
     section-name:    .text
 ---
 defined-atoms:
   - name:            .text
-    alignment:       2^4
+    alignment:       16
     section-choice:  custom-required
     section-name:    .text
   - name:            main
     scope:           global
     content:         [ B8, 00, 00, 00, 00, C7, 44, 24, FC, 00, 00, 00,
                        00, C3 ]
-    alignment:       2^4
+    alignment:       16
     section-choice:  custom-required
     section-name:    .text
 ---
 
 # CHECK: defined-atoms:
 # CHECK:   - name:            .text
-# CHECK:     alignment:       2^4
+# CHECK:     alignment:       16
 # CHECK:     section-choice:  custom-required
 # CHECK:     section-name:    .text
 # CHECK:   - name:            main
 # CHECK:     scope:           global
 # CHECK:     content:         [ B8, 00, 00, 00, 00, C7, 44, 24, FC, 00, 00, 00,
 # CHECK:                        00, C3 ]
-# CHECK:     alignment:       2^4
+# CHECK:     alignment:       16
 # CHECK:     section-choice:  custom-required
 # CHECK:     section-name:    .text
 

Modified: lld/trunk/test/elf/defsym.objtxt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/defsym.objtxt?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/defsym.objtxt (original)
+++ lld/trunk/test/elf/defsym.objtxt Wed Mar 25 17:06:04 2015
@@ -8,7 +8,7 @@ defined-atoms:
   - name:            main
     scope:           global
     content:         [ B8, 00, 00, 00, 00, C7, 44, 24, FC, 00, 00, 00, 00, C3 ]
-    alignment:       2^4
+    alignment:       16
     section-choice:  custom-required
     section-name:    .text
 

Modified: lld/trunk/test/elf/entry.objtxt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/entry.objtxt?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/entry.objtxt (original)
+++ lld/trunk/test/elf/entry.objtxt Wed Mar 25 17:06:04 2015
@@ -19,24 +19,24 @@
 
 defined-atoms:
   - name:            .text
-    alignment:       2^4
+    alignment:       16
     section-choice:  custom-required
     section-name:    .text
   - name:            main
     scope:           global
     content:         [ B8, 00, 00, 00, 00, C7, 44, 24, FC, 00, 00, 00,
                        00, C3 ]
-    alignment:       2^4
+    alignment:       16
     section-choice:  custom-required
     section-name:    .text
   - name:            .data
     type:            data
-    alignment:       2^2
+    alignment:       4
     section-choice:  custom-required
     section-name:    .data
   - name:            .bss
     type:            zero-fill
-    alignment:       2^2
+    alignment:       4
     section-choice:  custom-required
     section-name:    .bss
   - name:            .note.GNU-stack
@@ -48,7 +48,7 @@ defined-atoms:
                        01, 78, 10, 01, 1B, 0C, 07, 08, 90, 01, 00, 00,
                        14, 00, 00, 00, 1C, 00, 00, 00, 00, 00, 00, 00,
                        0E, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00 ]
-    alignment:       2^3
+    alignment:       8
     section-choice:  custom-required
     section-name:    .eh_frame
     permissions:     r--

Modified: lld/trunk/test/elf/linkerscript/externs.objtxt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/linkerscript/externs.objtxt?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/linkerscript/externs.objtxt (original)
+++ lld/trunk/test/elf/linkerscript/externs.objtxt Wed Mar 25 17:06:04 2015
@@ -8,7 +8,7 @@ defined-atoms:
   - name:            main
     scope:           global
     content:         [ B8, 00, 00, 00, 00, C7, 44, 24, FC, 00, 00, 00, 00, C3 ]
-    alignment:       2^4
+    alignment:       16
     section-choice:  custom-required
     section-name:    .text
 

Modified: lld/trunk/test/elf/linkerscript/valid-script-cli.objtxt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/linkerscript/valid-script-cli.objtxt?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/linkerscript/valid-script-cli.objtxt (original)
+++ lld/trunk/test/elf/linkerscript/valid-script-cli.objtxt Wed Mar 25 17:06:04 2015
@@ -16,7 +16,7 @@ defined-atoms:
   - name:            main
     scope:           global
     content:         [ B8, 00, 00, 00, 00, C7, 44, 24, FC, 00, 00, 00, 00, C3 ]
-    alignment:       2^4
+    alignment:       16
     section-choice:  custom-required
     section-name:    .text
 

Modified: lld/trunk/test/elf/mergeconstants.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/mergeconstants.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/mergeconstants.test (original)
+++ lld/trunk/test/elf/mergeconstants.test Wed Mar 25 17:06:04 2015
@@ -13,7 +13,7 @@ mergeAtoms:  - name:            foo
 mergeAtoms:    scope:           global
 mergeAtoms:    type:            data
 mergeAtoms:    content:         [ 00, 00, 00, 00, 00, 00, 00, 00 ]
-mergeAtoms:    alignment:       2^3
+mergeAtoms:    alignment:       8
 mergeAtoms:    references:
 mergeAtoms:      - kind:            R_X86_64_64
 mergeAtoms:        offset:          3

Modified: lld/trunk/test/elf/reloc.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/reloc.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/reloc.test (original)
+++ lld/trunk/test/elf/reloc.test Wed Mar 25 17:06:04 2015
@@ -7,7 +7,7 @@ ELF-i386:     type:            constant
 ELF-i386:     content:         [ 68, 65, 6C, 6C, 6F, 20, 77, 6F, 72, 6C, 64, 00 ]
 ELF-i386:     merge:           by-content
 ELF-i386:   - ref-name:        [[STRNAMEB:[-a-zA-Z0-9_]+]]
-ELF-i386:     alignment:       2^4
+ELF-i386:     alignment:       16
 ELF-i386:     section-choice:  custom-required
 ELF-i386:     section-name:    .text.startup
 ELF-i386:     references:
@@ -19,7 +19,7 @@ ELF-i386:     scope:           global
 ELF-i386:     content:         [ 55, 89, E5, 83, E4, F0, 83, EC, 10, C7, 04, 24,
 ELF-i386:                        00, 00, 00, 00, E8, FC, FF, FF, FF, 31, C0, C9,
 ELF-i386:                        C3 ]
-ELF-i386:     alignment:       2^4
+ELF-i386:     alignment:       16
 ELF-i386:     section-choice:  custom-required
 ELF-i386:     section-name:    .text.startup
 ELF-i386:     references:

Modified: lld/trunk/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test (original)
+++ lld/trunk/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test Wed Mar 25 17:06:04 2015
@@ -42,7 +42,7 @@
 #CHECKGROUP:  - name:            g1
 #CHECKGROUP:    scope:           global
 #CHECKGROUP:    content:         [ 55, 48, 89, E5, 31, C0, 5D, C3 ]
-#CHECKGROUP:    alignment:       2^4
+#CHECKGROUP:    alignment:       16
 #CHECKGROUP:    section-name:    .text
 #CHECKGROUPSECTIONS:    Name: .text
 #CHECKGROUPSECTIONS:    Type: SHT_PROGBITS

Modified: lld/trunk/test/elf/x86-64-dynamic-relocs.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/x86-64-dynamic-relocs.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/x86-64-dynamic-relocs.test (original)
+++ lld/trunk/test/elf/x86-64-dynamic-relocs.test Wed Mar 25 17:06:04 2015
@@ -6,7 +6,7 @@ defined-atoms:
   - name:            main
     scope:           global
     content:         [ E8, 00, 00, 00, 00, C3 ]
-    alignment:       2^4
+    alignment:       16
     section-choice:  custom-required
     section-name:    .text
     references:
@@ -17,7 +17,7 @@ defined-atoms:
   - name:            foo
     scope:           global
     content:         [ C3 ]
-    alignment:       6 mod 2^4
+    alignment:       6 mod 16
     section-choice:  custom-required
     section-name:    .text
 

Modified: lld/trunk/test/elf/x86-64-dynamic.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/x86-64-dynamic.test?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/elf/x86-64-dynamic.test (original)
+++ lld/trunk/test/elf/x86-64-dynamic.test Wed Mar 25 17:06:04 2015
@@ -24,7 +24,7 @@ CHECK:        addend:          -4
 CHECK:    type:            stub
 CHECK:    content:         [ FF, 35, 00, 00, 00, 00, FF, 25, 00, 00, 00, 00,
 CHECK:                       90, 90, 90, 90 ]
-CHECK:    alignment:       2^4
+CHECK:    alignment:       16
 CHECK:    section-choice:  custom-required
 CHECK:    section-name:    .plt
 CHECK:    references:
@@ -40,7 +40,7 @@ CHECK:        addend:          -4
 CHECK:    type:            stub
 CHECK:    content:         [ FF, 25, 00, 00, 00, 00, 68, 00, 00, 00, 00, E9,
 CHECK:                       00, 00, 00, 00 ]
-CHECK:    alignment:       2^4
+CHECK:    alignment:       16
 CHECK:    section-choice:  custom-required
 CHECK:    section-name:    .plt
 CHECK:    references:

Modified: lld/trunk/test/mach-o/align_text.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/align_text.yaml?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/mach-o/align_text.yaml (original)
+++ lld/trunk/test/mach-o/align_text.yaml Wed Mar 25 17:06:04 2015
@@ -33,13 +33,13 @@ local-symbols:
 
 # CHECK: defined-atoms:
 # CHECK:   - content:         [ 90, 90, 90 ]
-# CHECK:     alignment:       2^4
+# CHECK:     alignment:       16
 # CHECK:   - name:            _f1
 # CHECK:     content:         [ C3 ]
-# CHECK:     alignment:       3 mod 2^4
+# CHECK:     alignment:       3 mod 16
 # CHECK:   - name:            _f2
 # CHECK:     content:         [ C3 ]
-# CHECK:     alignment:       4 mod 2^4
+# CHECK:     alignment:       4 mod 16
 # CHECK:   - name:            _f3
 # CHECK:     content:         [ C3 ]
-# CHECK:     alignment:       5 mod 2^4
+# CHECK:     alignment:       5 mod 16

Modified: lld/trunk/test/mach-o/parse-tentative-defs.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/parse-tentative-defs.yaml?rev=233222&r1=233221&r2=233222&view=diff
==============================================================================
--- lld/trunk/test/mach-o/parse-tentative-defs.yaml (original)
+++ lld/trunk/test/mach-o/parse-tentative-defs.yaml Wed Mar 25 17:06:04 2015
@@ -57,32 +57,32 @@ undefined-symbols:
 # CHECK:        type:            zero-fill
 # CHECK:        size:            4
 # CHECK:        merge:           as-tentative
-# CHECK:        alignment:       2^2
+# CHECK:        alignment:       4
 
 # CHECK:       name:             _tent4_16
 # CHECK:        scope:           global
 # CHECK:        type:            zero-fill
 # CHECK:        size:            4
 # CHECK:        merge:           as-tentative
-# CHECK:        alignment:       2^4
+# CHECK:        alignment:       16
 
 # CHECK:       name:             _tent64_32
 # CHECK:        scope:           global
 # CHECK:        type:            zero-fill
 # CHECK:        size:            64
 # CHECK:        merge:           as-tentative
-# CHECK:        alignment:       2^5
+# CHECK:        alignment:       32
 
 # CHECK:       name:             _tent8
 # CHECK:        scope:           global
 # CHECK:        type:            zero-fill
 # CHECK:        size:            8
 # CHECK:        merge:           as-tentative
-# CHECK:        alignment:       2^3
+# CHECK:        alignment:       8
 
 # CHECK:       name:             _tentHidden
 # CHECK:        scope:           hidden
 # CHECK:        type:            zero-fill
 # CHECK:        size:            4
 # CHECK:        merge:           as-tentative
-# CHECK:        alignment:       2^2
+# CHECK:        alignment:       4





More information about the llvm-commits mailing list