Skip to content

Commit ac3096e

Browse files
committed
Revert "[lld-macho] Emit map file entry for compact unwind info"
This reverts commit 7f07799. This patch series breaks lld:map-file.s on arm v7 linux buildbots. e.g https://lab.llvm.org/buildbot/#/builders/178/builds/3190
1 parent e2c868f commit ac3096e

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

lld/MachO/MapFile.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ void macho::writeMapFile() {
182182
info.fileIndex);
183183
os.write_escaped(info.str) << "\n";
184184
}
185-
} else if (osec == (void *)in.unwindInfo) {
186-
os << format("0x%08llX\t0x%08llX\t[ 0] compact unwind info\n",
187-
osec->addr, osec->getSize());
188185
}
189186
// TODO print other synthetic sections
190187
}

lld/test/MachO/map-file.s

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
# CHECK-NEXT: Idx Name Size VMA Type
1616
# CHECK-NEXT: 0 __text {{[0-9a-f]+}} [[#%x,TEXT:]] TEXT
1717
# CHECK-NEXT: 1 __cstring {{[0-9a-f]+}} [[#%x,CSTR:]] DATA
18-
# CHECK-NEXT: 2 __unwind_info {{[0-9a-f]+}} [[#%x,UNWIND:]] DATA
19-
# CHECK-NEXT: 3 __eh_frame {{[0-9a-f]+}} [[#%x,EH_FRAME:]] DATA
20-
# CHECK-NEXT: 4 __common {{[0-9a-f]+}} [[#%x,BSS:]] BSS
18+
# CHECK-NEXT: 2 __common {{[0-9a-f]+}} [[#%x,BSS:]] BSS
2119

2220
# CHECK: SYMBOL TABLE:
2321
# CHECK-DAG: [[#%x,MAIN:]] g F __TEXT,__text _main
@@ -36,12 +34,10 @@
3634
# CHECK-NEXT: [ 3] {{.*}}{{/|\\}}map-file.s.tmp/c-string-literal.o
3735

3836
# CHECK-NEXT: # Sections:
39-
# CHECK-NEXT: # Address Size Segment Section
40-
# CHECK-NEXT: 0x[[#%X,TEXT]] 0x{{[0-9A-F]+}} __TEXT __text
41-
# CHECK-NEXT: 0x[[#%X,CSTR]] 0x{{[0-9A-F]+}} __TEXT __cstring
42-
# CHECK-NEXT: 0x[[#%X,UNWIND]] 0x{{[0-9A-F]+}} __TEXT __unwind_info
43-
# CHECK-NEXT: 0x[[#%X,EH_FRAME]] 0x{{[0-9A-F]+}} __TEXT __eh_frame
44-
# CHECK-NEXT: 0x[[#%X,BSS]] 0x{{[0-9A-F]+}} __DATA __common
37+
# CHECK-NEXT: # Address Size Segment Section
38+
# CHECK-NEXT: 0x[[#%X,TEXT]] 0x{{[0-9A-F]+}} __TEXT __text
39+
# CHECK-NEXT: 0x[[#%X,CSTR]] 0x{{[0-9A-F]+}} __TEXT __cstring
40+
# CHECK-NEXT: 0x[[#%X,BSS]] 0x{{[0-9A-F]+}} __DATA __common
4541

4642
# CHECK-NEXT: # Symbols:
4743
# CHECK-NEXT: # Address Size File Name
@@ -52,7 +48,6 @@
5248
# CHECK-DAG: 0x[[#%X,HIITSME]] 0x0000000F [ 3] literal string: Hello, it's me
5349
# CHECK-DAG: 0x[[#%X,HIITSME + 0xf]] 0x0000000E [ 3] literal string: Hello world!\n
5450
# CHECK-DAG: 0x[[#%X,NUMBER]] 0x00000001 [ 1] _number
55-
# CHECK-DAG: 0x[[#%X,UNWIND]] 0x0000103C [ 0] compact unwind info
5651

5752
# MAPFILE: "name":"Total Write map file"
5853

@@ -94,10 +89,7 @@ __ZTIN3foo3bar4MethE:
9489
.globl _main, _bar
9590

9691
_main:
97-
.cfi_startproc
98-
.cfi_def_cfa_offset 16
9992
ret
100-
.cfi_endproc
10193

10294
_bar:
10395
nop

0 commit comments

Comments
 (0)