[ELF][tests] changes for test cases

llvm-svn: 176280

diff --git a/lld/test/elf/Hexagon/sda-base.test b/lld/test/elf/Hexagon/sda-base.test
index b7b730e..5db1dc3 100644 (file)
--- a/lld/test/elf/Hexagon/sda-base.test
+++ b/lld/test/elf/Hexagon/sda-base.test
@@ -1,4 +1,4 @@
 RUN: lld-core -arch hexagon -reader ELF %p/Inputs/sda-base.o -writer ELF -o %t1
 RUN: llvm-nm -n %t1 | FileCheck %s -check-prefix=sdabase
 
-sdabase: 00002000 A _SDA_BASE_
+sdabase: 00001000 A _SDA_BASE_

diff --git a/lld/test/elf/dynamic-segorder.test b/lld/test/elf/dynamic-segorder.test
index a9dd439..57fa661 100644 (file)
--- a/lld/test/elf/dynamic-segorder.test
+++ b/lld/test/elf/dynamic-segorder.test
@@ -10,7 +10,7 @@ CHECK: flags r--
 CHECK: LOAD
 CHECK: flags r-x
 CHECK: LOAD
-CHECK: flags r--
+CHECK: flags rw-
 CHECK: LOAD
 CHECK: flags rw-
 CHECK: DYNAMIC

diff --git a/lld/test/elf/entry.objtxt b/lld/test/elf/entry.objtxt
index 63e0180..8351ade 100644 (file)
--- a/lld/test/elf/entry.objtxt
+++ b/lld/test/elf/entry.objtxt
@@ -11,9 +11,9 @@
 # RUN: lld-core -reader YAML %s -writer ELF --entry=_entrypoint -o %t1
 # RUN: llvm-nm -n %t1 | FileCheck %s
 # 
-# CHECK:  000000a0 T main
-# CHECK:  00002000 A _end
-# CHECK:  00002000 A end
+# CHECK:  00000080 T main
+# CHECK:  00001000 A _end
+# CHECK:  00001000 A end
 # CHECK:           w _entrypoint
 
 defined-atoms:   

diff --git a/lld/test/elf/hexagon-quickdata-sort.test b/lld/test/elf/hexagon-quickdata-sort.test
index c53b186..952ed6e 100644 (file)
--- a/lld/test/elf/hexagon-quickdata-sort.test
+++ b/lld/test/elf/hexagon-quickdata-sort.test
@@ -1,12 +1,12 @@
 RUN: lld-core -arch hexagon -reader ELF %p/Inputs/quickdata-sort-test.o.elf-hexagon -writer ELF -o %t1
 RUN: llvm-nm -n %t1 | FileCheck %s -check-prefix=quickdataSort 
 
-quickdataSort: 00002000 D A1
-quickdataSort: 00002001 D AA1
-quickdataSort: 00002002 D B1
-quickdataSort: 00002004 D BB1
-quickdataSort: 00002008 D C1
-quickdataSort: 0000200c D CC1
-quickdataSort: 00002010 D D1
-quickdataSort: 00002018 D DD1
+quickdataSort: 00001000 D A1
+quickdataSort: 00001001 D AA1
+quickdataSort: 00001002 D B1
+quickdataSort: 00001004 D BB1
+quickdataSort: 00001008 D C1
+quickdataSort: 0000100c D CC1
+quickdataSort: 00001010 D D1
+quickdataSort: 00001018 D DD1
 

diff --git a/lld/test/elf/hexagon-quickdata-sortcommon.test b/lld/test/elf/hexagon-quickdata-sortcommon.test
index 1da0fbb..eb66da5 100644 (file)
--- a/lld/test/elf/hexagon-quickdata-sortcommon.test
+++ b/lld/test/elf/hexagon-quickdata-sortcommon.test
@@ -1,16 +1,16 @@
 RUN: lld-core -arch hexagon -reader ELF %p/Inputs/quickdata-sortcommon-test.o.elf-hexagon -writer ELF -o %t1
 RUN: llvm-nm -n %t1 | FileCheck %s -check-prefix=quickdataSortCommon
 
-quickdataSortCommon: 00002000 D A1
-quickdataSortCommon: 00002001 D AA1
-quickdataSortCommon: 00002002 D AAA1
-quickdataSortCommon: 00002004 D B1
-quickdataSortCommon: 00002006 D BB1
-quickdataSortCommon: 00002008 D BBB1
-quickdataSortCommon: 0000200c D C1
-quickdataSortCommon: 00002010 D CC1
-quickdataSortCommon: 00002014 D CCC1
-quickdataSortCommon: 00002018 D D1
-quickdataSortCommon: 00002020 D DD1
-quickdataSortCommon: 00002028 D DDD1
+quickdataSortCommon: 00001000 D A1
+quickdataSortCommon: 00001001 D AA1
+quickdataSortCommon: 00001002 D AAA1
+quickdataSortCommon: 00001004 D B1
+quickdataSortCommon: 00001006 D BB1
+quickdataSortCommon: 00001008 D BBB1
+quickdataSortCommon: 0000100c D C1
+quickdataSortCommon: 00001010 D CC1
+quickdataSortCommon: 00001014 D CCC1
+quickdataSortCommon: 00001018 D D1
+quickdataSortCommon: 00001020 D DD1
+quickdataSortCommon: 00001028 D DDD1
 

diff --git a/lld/test/elf/ifunc.test b/lld/test/elf/ifunc.test
index 97b9feb..25dde57 100644 (file)
--- a/lld/test/elf/ifunc.test
+++ b/lld/test/elf/ifunc.test
@@ -38,6 +38,6 @@ PLT: kind: R_X86_64_PC32
 
 // This is a horribly brittle test. We need a way to do arithmetic on captured
 // variables.
-BIN: 40012c: ff 25 ce 1e 00 00 jmpq *7886(%rip)
+BIN: 4000ec: ff 25 0e 0f 00 00 jmpq *3854(%rip)
 BIN: .got.plt:
-BIN-NEXT: 402000 00000000 00000000
+BIN-NEXT: 401000 00000000 00000000

diff --git a/lld/test/elf/mergeatoms.objtxt b/lld/test/elf/mergeatoms.objtxt
index a097e05..82761ca 100644 (file)
--- a/lld/test/elf/mergeatoms.objtxt
+++ b/lld/test/elf/mergeatoms.objtxt
@@ -2,4 +2,4 @@ RUN: lld-core -merge-strings=true -reader ELF -writer ELF \
 RUN: -o %t1 %p/Inputs/foo.o.x86-64 %p/Inputs/bar.o.x86-64
 RUN: llvm-objdump -s %t1 |  FileCheck -check-prefix=mergeAtoms %s
 
-mergeAtoms:  1000 62617200 666f6f00                    bar.foo.
+mergeAtoms:  0074 62617200 666f6f00                    bar.foo.

diff --git a/lld/test/elf/phdr.objtxt b/lld/test/elf/phdr.objtxt
index 520eb7f..5b6bdf4 100644 (file)
--- a/lld/test/elf/phdr.objtxt
+++ b/lld/test/elf/phdr.objtxt
@@ -5,37 +5,26 @@ RUN: lld -core -target x86_64-linux -output=%t1 %p/Inputs/relocs.x86-64 \
 RUN:   -output-type=static && llvm-objdump -p %t1 \
 RUN: | FileCheck %s -check-prefix=X86_64
 
-
 ED:  (('p_type', 0x00000001)
 ED:   ('p_flags', 0x00000005)
 ED:   ('p_offset', 0x00000000)
 ED:   ('p_vaddr', 0x00000000)
 ED:   ('p_paddr', 0x00000000)
-ED:   ('p_filesz', 0x000000d9)
-ED:   ('p_memsz', 0x000000d9)
+ED:   ('p_filesz', 0x00000144)
+ED:   ('p_memsz', 0x00000144)
 ED:   ('p_align', 0x00001000)
 ED:  ),
 ED:  # Program Header 1
 ED:  (('p_type', 0x00000001)
-ED:   ('p_flags', 0x00000004)
+ED:   ('p_flags', 0x00000006)
 ED:   ('p_offset', 0x00001000)
 ED:   ('p_vaddr', 0x00001000)
 ED:   ('p_paddr', 0x00001000)
-ED:   ('p_filesz', 0x0000008c)
-ED:   ('p_memsz', 0x0000008c)
-ED:   ('p_align', 0x00001000)
-ED:  ),
-ED:  # Program Header 2
-ED:  (('p_type', 0x00000001)
-ED:   ('p_flags', 0x00000006)
-ED:   ('p_offset', 0x00002000)
-ED:   ('p_vaddr', 0x00002000)
-ED:   ('p_paddr', 0x00002000)
 ED:   ('p_filesz', 0x00000104)
 ED:   ('p_memsz', 0x00000004)
 ED:   ('p_align', 0x00001000)
 ED:  ),
-ED:  # Program Header 3
+ED:  # Program Header 2
 ED:  (('p_type', 0x00000001)
 ED:   ('p_flags', 0x00000006)
 ED:   ('p_offset', 0x00004000)

diff --git a/lld/test/elf/rodata.objtxt b/lld/test/elf/rodata.objtxt
index a1c7db4..e6dcfee 100644 (file)
--- a/lld/test/elf/rodata.objtxt
+++ b/lld/test/elf/rodata.objtxt
@@ -4,6 +4,6 @@ RUN: lld-core -arch hexagon -reader ELF -writer ELF -o %t2 \
 RUN:   %p/Inputs/rodata-test.hexagon
 RUN: llvm-objdump -section-headers %t2 |  FileCheck -check-prefix=hexagon %s
 
-i386: 1 .rodata       00000004 0000000000001000 DATA
+i386: 1 .rodata       00000004 0000000000000074 DATA
 
-hexagon: 1 .rodata       00000004 0000000000001000 DATA
+hexagon: 1 .rodata       00000004 0000000000000074 DATA

diff --git a/lld/test/elf/symbols.objtxt b/lld/test/elf/symbols.objtxt
index e6c7591..ba33a7d 100644 (file)
--- a/lld/test/elf/symbols.objtxt
+++ b/lld/test/elf/symbols.objtxt
@@ -18,10 +18,10 @@ RUN: lld-core -reader ELF %p/Inputs/writersyms.o -writer ELF -o %t1
 RUN: llvm-nm -n %t1 | FileCheck -check-prefix CHECKSYMS %s
 
 CHECKSYMS:  00000000 a 1.c
-CHECKSYMS:  00000094 T main
-CHECKSYMS:  00002000 A __bss_start
-CHECKSYMS:  00002000 B a
-CHECKSYMS:  00002004 A __bss_end
-CHECKSYMS:  00002004 A _end
-CHECKSYMS:  00002004 A end
+CHECKSYMS:  00000074 T main
+CHECKSYMS:  00001000 A __bss_start
+CHECKSYMS:  00001000 B a
+CHECKSYMS:  00001004 A __bss_end
+CHECKSYMS:  00001004 A _end
+CHECKSYMS:  00001004 A end
 CHECKSYMS:           w _start