[lld] r317460 - Update tests for ARMNT/ARM64 reloc names
Martin Storsjo via llvm-commits
llvm-commits at lists.llvm.org
Sun Nov 5 23:22:17 PST 2017
Author: mstorsjo
Date: Sun Nov 5 23:22:17 2017
New Revision: 317460
URL: http://llvm.org/viewvc/llvm-project?rev=317460&view=rev
Log:
Update tests for ARMNT/ARM64 reloc names
After ObjectYAML learnt the proper enum names for ARMNT/ARM64
relocations, it no longer accepts the numerical values.
This fixes LLD tests after SVN r317459 in LLVM.
Modified:
lld/trunk/test/COFF/arm64-import2.test
lld/trunk/test/COFF/arm64-relocs-imports.test
lld/trunk/test/COFF/armnt-blx23t.test
lld/trunk/test/COFF/armnt-branch24t.test
lld/trunk/test/COFF/armnt-imports.test
lld/trunk/test/COFF/armnt-mov32t-exec.test
lld/trunk/test/COFF/armnt-movt32t.test
lld/trunk/test/COFF/delayimports-armnt.yaml
lld/trunk/test/COFF/locally-imported-arm64.test
lld/trunk/test/COFF/reloc-arm.test
Modified: lld/trunk/test/COFF/arm64-import2.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/arm64-import2.test?rev=317460&r1=317459&r2=317460&view=diff
==============================================================================
--- lld/trunk/test/COFF/arm64-import2.test (original)
+++ lld/trunk/test/COFF/arm64-import2.test Sun Nov 5 23:22:17 2017
@@ -47,10 +47,10 @@ sections:
Relocations:
- VirtualAddress: 0
SymbolName: function
- Type: 3
+ Type: IMAGE_REL_ARM64_BRANCH26
- VirtualAddress: 4
SymbolName: function2
- Type: 3
+ Type: IMAGE_REL_ARM64_BRANCH26
symbols:
- Name: .text
Value: 0
Modified: lld/trunk/test/COFF/arm64-relocs-imports.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/arm64-relocs-imports.test?rev=317460&r1=317459&r2=317460&view=diff
==============================================================================
--- lld/trunk/test/COFF/arm64-relocs-imports.test (original)
+++ lld/trunk/test/COFF/arm64-relocs-imports.test Sun Nov 5 23:22:17 2017
@@ -86,82 +86,82 @@ sections:
Relocations:
- VirtualAddress: 4
SymbolName: .Lstr
- Type: 4
+ Type: IMAGE_REL_ARM64_PAGEBASE_REL21
- VirtualAddress: 8
SymbolName: .Lstr
- Type: 6
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12A
- VirtualAddress: 12
SymbolName: function
- Type: 3
+ Type: IMAGE_REL_ARM64_BRANCH26
- VirtualAddress: 16
SymbolName: .Lglobal
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 20
SymbolName: .Lglobal
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 24
SymbolName: .Lglobal
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 28
SymbolName: .Lglobal
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 32
SymbolName: .Lglobal
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 36
SymbolName: .Lglobal
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 40
SymbolName: .Lglobal
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 44
SymbolName: .Lglobal
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 48
SymbolName: .Lglobal16
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 52
SymbolName: .Lglobal16
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 56
SymbolName: .Lglobal16
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 60
SymbolName: .Lglobal16
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 64
SymbolName: .Lglobal16
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 68
SymbolName: .Lglobal16
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 72
SymbolName: .Lglobal16
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 76
SymbolName: .Lglobal16
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 80
SymbolName: .Lglobal16
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 84
SymbolName: .Lglobal16
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 88
SymbolName: .Lglobal
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 92
SymbolName: .Lglobal16
- Type: 4
+ Type: IMAGE_REL_ARM64_PAGEBASE_REL21
- VirtualAddress: 96
SymbolName: .Lglobal0
- Type: 7
+ Type: IMAGE_REL_ARM64_PAGEOFFSET_12L
- VirtualAddress: 112
SymbolName: .Lglobal
- Type: 14
+ Type: IMAGE_REL_ARM64_ADDR64
- VirtualAddress: 120
SymbolName: .Lglobal
- Type: 2
+ Type: IMAGE_REL_ARM64_ADDR32NB
- Name: .data
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
Alignment: 4
Modified: lld/trunk/test/COFF/armnt-blx23t.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/armnt-blx23t.test?rev=317460&r1=317459&r2=317460&view=diff
==============================================================================
--- lld/trunk/test/COFF/armnt-blx23t.test (original)
+++ lld/trunk/test/COFF/armnt-blx23t.test Sun Nov 5 23:22:17 2017
@@ -37,7 +37,7 @@ sections:
Relocations:
- VirtualAddress: 12
SymbolName: identity
- Type: 21
+ Type: IMAGE_REL_ARM_BLX23T
symbols:
- Name: .text
Value: 0
Modified: lld/trunk/test/COFF/armnt-branch24t.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/armnt-branch24t.test?rev=317460&r1=317459&r2=317460&view=diff
==============================================================================
--- lld/trunk/test/COFF/armnt-branch24t.test (original)
+++ lld/trunk/test/COFF/armnt-branch24t.test Sun Nov 5 23:22:17 2017
@@ -30,7 +30,7 @@ sections:
Relocations:
- VirtualAddress: 6
SymbolName: identity
- Type: 20
+ Type: IMAGE_REL_ARM_BRANCH24T
symbols:
- Name: .text
Value: 0
Modified: lld/trunk/test/COFF/armnt-imports.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/armnt-imports.test?rev=317460&r1=317459&r2=317460&view=diff
==============================================================================
--- lld/trunk/test/COFF/armnt-imports.test (original)
+++ lld/trunk/test/COFF/armnt-imports.test Sun Nov 5 23:22:17 2017
@@ -22,7 +22,7 @@ sections:
Relocations:
- VirtualAddress: 0
SymbolName: __imp_function
- Type: 17
+ Type: IMAGE_REL_ARM_MOV32T
symbols:
- Name: .text
Value: 0
Modified: lld/trunk/test/COFF/armnt-mov32t-exec.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/armnt-mov32t-exec.test?rev=317460&r1=317459&r2=317460&view=diff
==============================================================================
--- lld/trunk/test/COFF/armnt-mov32t-exec.test (original)
+++ lld/trunk/test/COFF/armnt-mov32t-exec.test Sun Nov 5 23:22:17 2017
@@ -31,7 +31,7 @@ sections:
Relocations:
- VirtualAddress: 4
SymbolName: function
- Type: 17
+ Type: IMAGE_REL_ARM_MOV32T
symbols:
- Name: .text
Value: 0
Modified: lld/trunk/test/COFF/armnt-movt32t.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/armnt-movt32t.test?rev=317460&r1=317459&r2=317460&view=diff
==============================================================================
--- lld/trunk/test/COFF/armnt-movt32t.test (original)
+++ lld/trunk/test/COFF/armnt-movt32t.test Sun Nov 5 23:22:17 2017
@@ -27,7 +27,7 @@ sections:
Relocations:
- VirtualAddress: 0
SymbolName: buffer
- Type: 17
+ Type: IMAGE_REL_ARM_MOV32T
- Name: .rdata
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
Alignment: 1
Modified: lld/trunk/test/COFF/delayimports-armnt.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/delayimports-armnt.yaml?rev=317460&r1=317459&r2=317460&view=diff
==============================================================================
--- lld/trunk/test/COFF/delayimports-armnt.yaml (original)
+++ lld/trunk/test/COFF/delayimports-armnt.yaml Sun Nov 5 23:22:17 2017
@@ -77,7 +77,7 @@ sections:
Relocations:
- VirtualAddress: 0
SymbolName: __imp_function
- Type: 17
+ Type: IMAGE_REL_ARM_MOV32T
symbols:
- Name: .text
Value: 0
Modified: lld/trunk/test/COFF/locally-imported-arm64.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/locally-imported-arm64.test?rev=317460&r1=317459&r2=317460&view=diff
==============================================================================
--- lld/trunk/test/COFF/locally-imported-arm64.test (original)
+++ lld/trunk/test/COFF/locally-imported-arm64.test Sun Nov 5 23:22:17 2017
@@ -31,7 +31,7 @@ sections:
Relocations:
- VirtualAddress: 0
SymbolName: __imp_main
- Type: 2
+ Type: IMAGE_REL_ARM64_ADDR32NB
symbols:
- Name: .text
Value: 0
Modified: lld/trunk/test/COFF/reloc-arm.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/reloc-arm.test?rev=317460&r1=317459&r2=317460&view=diff
==============================================================================
--- lld/trunk/test/COFF/reloc-arm.test (original)
+++ lld/trunk/test/COFF/reloc-arm.test Sun Nov 5 23:22:17 2017
@@ -28,28 +28,28 @@ sections:
Relocations:
- VirtualAddress: 0
SymbolName: foo
- Type: 1 # IMAGE_REL_ARM_ADDR32
+ Type: IMAGE_REL_ARM_ADDR32
- VirtualAddress: 16
SymbolName: foo
- Type: 2 # IMAGE_REL_ARM_ADDR32NB
+ Type: IMAGE_REL_ARM_ADDR32NB
- VirtualAddress: 32
SymbolName: foo
- Type: 17 # IMAGE_REL_ARM_MOV32T
+ Type: IMAGE_REL_ARM_MOV32T
- VirtualAddress: 48
SymbolName: foo
- Type: 20 # IMAGE_REL_ARM_BRANCH24T
+ Type: IMAGE_REL_ARM_BRANCH24T
- VirtualAddress: 64
SymbolName: foo
- Type: 18 # IMAGE_REL_ARM_BRANCH20T
+ Type: IMAGE_REL_ARM_BRANCH20T
- VirtualAddress: 80
SymbolName: foo
- Type: 21 # IMAGE_REL_ARM_BLX23T
+ Type: IMAGE_REL_ARM_BLX23T
- VirtualAddress: 96
SymbolName: bar
- Type: 20 # IMAGE_REL_ARM_BRANCH24T
+ Type: IMAGE_REL_ARM_BRANCH24T
- VirtualAddress: 112
SymbolName: bar
- Type: 15 # IMAGE_REL_ARM_SECREL
+ Type: IMAGE_REL_ARM_SECREL
symbols:
- Name: .aaa
Value: 0
More information about the llvm-commits
mailing list