From 2c83917c4261df69dc11ff00ccdd9f4fe063d032 Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Fri, 29 Apr 2016 13:21:26 +0000 Subject: [PATCH] [mips] Update tests to account for section size rounding change in r268036. llvm-svn: 268039 --- lld/test/ELF/basic-mips.s | 6 ++--- lld/test/ELF/mips-26.s | 1 + lld/test/ELF/mips-npic-call-pic.s | 40 ++++++++++++++++--------------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/lld/test/ELF/basic-mips.s b/lld/test/ELF/basic-mips.s index c598c7b5f2f7..545a84e586f9 100644 --- a/lld/test/ELF/basic-mips.s +++ b/lld/test/ELF/basic-mips.s @@ -95,7 +95,7 @@ __start: # CHECK-NEXT: ] # CHECK-NEXT: Address: 0x20000 # CHECK-NEXT: Offset: 0x10000 -# CHECK-NEXT: Size: 12 +# CHECK-NEXT: Size: 16 # CHECK-NEXT: Link: 0 # CHECK-NEXT: Info: 0 # CHECK-NEXT: AddressAlignment: 16 @@ -254,8 +254,8 @@ __start: # CHECK-NEXT: Offset: 0x10000 # CHECK-NEXT: VirtualAddress: 0x20000 # CHECK-NEXT: PhysicalAddress: 0x20000 -# CHECK-NEXT: FileSize: 12 -# CHECK-NEXT: MemSize: 12 +# CHECK-NEXT: FileSize: 16 +# CHECK-NEXT: MemSize: 16 # CHECK-NEXT: Flags [ (0x5) # CHECK-NEXT: PF_R (0x4) # CHECK-NEXT: PF_X (0x1) diff --git a/lld/test/ELF/mips-26.s b/lld/test/ELF/mips-26.s index b463c1ac2127..38dfa5a12f9b 100644 --- a/lld/test/ELF/mips-26.s +++ b/lld/test/ELF/mips-26.s @@ -25,6 +25,7 @@ # # CHECK: loc: # CHECK-NEXT: 20018: 00 00 00 00 nop +# CHECK-NEXT: 2001c: 00 00 00 00 nop # CHECK-NEXT: Disassembly of section .plt: # CHECK-NEXT: .plt: # CHECK-NEXT: 20020: 3c 1c 00 04 lui $gp, 4 diff --git a/lld/test/ELF/mips-npic-call-pic.s b/lld/test/ELF/mips-npic-call-pic.s index 755963cfce56..fd23a52dac9b 100644 --- a/lld/test/ELF/mips-npic-call-pic.s +++ b/lld/test/ELF/mips-npic-call-pic.s @@ -11,16 +11,16 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 20000: 0c 00 80 0e jal 131128 +# CHECK-NEXT: 20000: 0c 00 80 10 jal 131136 # ^-- .pic.foo1a # CHECK-NEXT: 20004: 00 00 00 00 nop -# CHECK-NEXT: 20008: 0c 00 80 19 jal 131172 +# CHECK-NEXT: 20008: 0c 00 80 1c jal 131184 # ^-- .pic.foo2 # CHECK-NEXT: 2000c: 00 00 00 00 nop -# CHECK-NEXT: 20010: 0c 00 80 12 jal 131144 +# CHECK-NEXT: 20010: 0c 00 80 14 jal 131152 # ^-- .pic.foo1b # CHECK-NEXT: 20014: 00 00 00 00 nop -# CHECK-NEXT: 20018: 0c 00 80 19 jal 131172 +# CHECK-NEXT: 20018: 0c 00 80 1c jal 131184 # ^-- .pic.foo2 # CHECK-NEXT: 2001c: 00 00 00 00 nop # CHECK-NEXT: 20020: 0c 00 80 28 jal 131232 @@ -34,28 +34,29 @@ # # CHECK: foo1b: # CHECK-NEXT: 20034: 00 00 00 00 nop +# CHECK-NEXT: 20038: 00 00 00 00 nop +# CHECK-NEXT: 2003c: 00 00 00 00 nop # -# CHECK-NEXT: 20038: 3c 19 00 02 lui $25, 2 -# CHECK-NEXT: 2003c: 08 00 80 0c j 131120 -# CHECK-NEXT: 20040: 27 39 00 30 addiu $25, $25, 48 -# CHECK-NEXT: 20044: 00 00 00 00 nop -# CHECK-NEXT: 20048: 3c 19 00 02 lui $25, 2 -# CHECK-NEXT: 2004c: 08 00 80 0d j 131124 -# CHECK-NEXT: 20050: 27 39 00 34 addiu $25, $25, 52 -# CHECK-NEXT: 20054: 00 00 00 00 nop -# CHECK-NEXT: 20058: 00 00 00 00 nop +# CHECK-NEXT: 20040: 3c 19 00 02 lui $25, 2 +# CHECK-NEXT: 20044: 08 00 80 0c j 131120 +# CHECK-NEXT: 20048: 27 39 00 30 addiu $25, $25, 48 +# CHECK-NEXT: 2004c: 00 00 00 00 nop +# CHECK-NEXT: 20050: 3c 19 00 02 lui $25, 2 +# CHECK-NEXT: 20054: 08 00 80 0d j 131124 +# CHECK-NEXT: 20058: 27 39 00 34 addiu $25, $25, 52 # CHECK-NEXT: 2005c: 00 00 00 00 nop # # CHECK: foo2: # CHECK-NEXT: 20060: 00 00 00 00 nop +# CHECK-NEXT: 20064: 00 00 00 00 nop +# CHECK-NEXT: 20068: 00 00 00 00 nop +# CHECK-NEXT: 2006c: 00 00 00 00 nop # -# CHECK-NEXT: 20064: 3c 19 00 02 lui $25, 2 -# CHECK-NEXT: 20068: 08 00 80 18 j 131168 -# CHECK-NEXT: 2006c: 27 39 00 60 addiu $25, $25, 96 -# CHECK-NEXT: 20070: 00 00 00 00 nop -# CHECK-NEXT: 20074: 00 00 00 00 nop -# CHECK-NEXT: 20078: 00 00 00 00 nop +# CHECK-NEXT: 20070: 3c 19 00 02 lui $25, 2 +# CHECK-NEXT: 20074: 08 00 80 18 j 131168 +# CHECK-NEXT: 20078: 27 39 00 60 addiu $25, $25, 96 # CHECK-NEXT: 2007c: 00 00 00 00 nop + # # CHECK: fpic: # CHECK-NEXT: 20080: 00 00 00 00 nop @@ -71,6 +72,7 @@ # CHECK-NEXT: 200a0: 3c 19 00 02 lui $25, 2 # CHECK-NEXT: 200a4: 08 00 80 20 j 131200 # CHECK-NEXT: 200a8: 27 39 00 80 addiu $25, $25, 128 +# CHECK-NEXT: 200ac: 00 00 00 00 nop .text .globl __start