From e2e8e08ec360f77de250ee5b1633270021553a44 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 6 Nov 2017 07:22:17 +0000 Subject: [PATCH] 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. llvm-svn: 317460 --- lld/test/COFF/arm64-import2.test | 4 +- lld/test/COFF/arm64-relocs-imports.test | 52 +++++++++++------------ lld/test/COFF/armnt-blx23t.test | 2 +- lld/test/COFF/armnt-branch24t.test | 2 +- lld/test/COFF/armnt-imports.test | 2 +- lld/test/COFF/armnt-mov32t-exec.test | 2 +- lld/test/COFF/armnt-movt32t.test | 2 +- lld/test/COFF/delayimports-armnt.yaml | 2 +- lld/test/COFF/locally-imported-arm64.test | 2 +- lld/test/COFF/reloc-arm.test | 16 +++---- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/lld/test/COFF/arm64-import2.test b/lld/test/COFF/arm64-import2.test index 3811f3ed775b..3119e73e1d54 100644 --- a/lld/test/COFF/arm64-import2.test +++ b/lld/test/COFF/arm64-import2.test @@ -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 diff --git a/lld/test/COFF/arm64-relocs-imports.test b/lld/test/COFF/arm64-relocs-imports.test index e31b172aac35..ce301a3c0b76 100644 --- a/lld/test/COFF/arm64-relocs-imports.test +++ b/lld/test/COFF/arm64-relocs-imports.test @@ -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 diff --git a/lld/test/COFF/armnt-blx23t.test b/lld/test/COFF/armnt-blx23t.test index 5caf6ebaa127..ec36225e4332 100644 --- a/lld/test/COFF/armnt-blx23t.test +++ b/lld/test/COFF/armnt-blx23t.test @@ -37,7 +37,7 @@ sections: Relocations: - VirtualAddress: 12 SymbolName: identity - Type: 21 + Type: IMAGE_REL_ARM_BLX23T symbols: - Name: .text Value: 0 diff --git a/lld/test/COFF/armnt-branch24t.test b/lld/test/COFF/armnt-branch24t.test index 6e1114c94a18..88d17e445b1e 100644 --- a/lld/test/COFF/armnt-branch24t.test +++ b/lld/test/COFF/armnt-branch24t.test @@ -30,7 +30,7 @@ sections: Relocations: - VirtualAddress: 6 SymbolName: identity - Type: 20 + Type: IMAGE_REL_ARM_BRANCH24T symbols: - Name: .text Value: 0 diff --git a/lld/test/COFF/armnt-imports.test b/lld/test/COFF/armnt-imports.test index 519886eb0c06..7d3612a0df7e 100644 --- a/lld/test/COFF/armnt-imports.test +++ b/lld/test/COFF/armnt-imports.test @@ -22,7 +22,7 @@ sections: Relocations: - VirtualAddress: 0 SymbolName: __imp_function - Type: 17 + Type: IMAGE_REL_ARM_MOV32T symbols: - Name: .text Value: 0 diff --git a/lld/test/COFF/armnt-mov32t-exec.test b/lld/test/COFF/armnt-mov32t-exec.test index 629f0620730d..abc78c7fcc5b 100644 --- a/lld/test/COFF/armnt-mov32t-exec.test +++ b/lld/test/COFF/armnt-mov32t-exec.test @@ -31,7 +31,7 @@ sections: Relocations: - VirtualAddress: 4 SymbolName: function - Type: 17 + Type: IMAGE_REL_ARM_MOV32T symbols: - Name: .text Value: 0 diff --git a/lld/test/COFF/armnt-movt32t.test b/lld/test/COFF/armnt-movt32t.test index 6a9bf256e335..7c6965efed6a 100644 --- a/lld/test/COFF/armnt-movt32t.test +++ b/lld/test/COFF/armnt-movt32t.test @@ -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 diff --git a/lld/test/COFF/delayimports-armnt.yaml b/lld/test/COFF/delayimports-armnt.yaml index a1625511f386..231b4bc5c1f1 100644 --- a/lld/test/COFF/delayimports-armnt.yaml +++ b/lld/test/COFF/delayimports-armnt.yaml @@ -77,7 +77,7 @@ sections: Relocations: - VirtualAddress: 0 SymbolName: __imp_function - Type: 17 + Type: IMAGE_REL_ARM_MOV32T symbols: - Name: .text Value: 0 diff --git a/lld/test/COFF/locally-imported-arm64.test b/lld/test/COFF/locally-imported-arm64.test index 7a64b794e6f9..35200ffc1e8d 100644 --- a/lld/test/COFF/locally-imported-arm64.test +++ b/lld/test/COFF/locally-imported-arm64.test @@ -31,7 +31,7 @@ sections: Relocations: - VirtualAddress: 0 SymbolName: __imp_main - Type: 2 + Type: IMAGE_REL_ARM64_ADDR32NB symbols: - Name: .text Value: 0 diff --git a/lld/test/COFF/reloc-arm.test b/lld/test/COFF/reloc-arm.test index 1f3de619c44b..872e6d53c8aa 100644 --- a/lld/test/COFF/reloc-arm.test +++ b/lld/test/COFF/reloc-arm.test @@ -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