dbghelp: Look for .eh_fram if no .eh_frame is found.

lld produces these, because '.eh_frame' misses the eight-character limit by one character, but '.eh_fram' does not. This allows it to avoid producing a string table for this common section. Signed-off-by: Chip Davis <cdavis@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dbghelp: Look for .eh_fram if no .eh_frame is found.
8000b541 · Chip Davis · Alexandre Julliard · 8341b51b · 8000b541
Commit 8000b541 authored Jan 11, 2020 by Chip Davis Committed by Alexandre Julliard Jan 13, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

dwarf.c dlls/dbghelp/dwarf.c +3 -1

No files found.
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -3516,7 +3516,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset,
    BOOL                ret = TRUE;
    struct module_format* dwarf2_modfmt;

-    dwarf2_init_section(&eh_frame,                fmap, ".eh_frame",     NULL,             &eh_frame_sect);
+    if (!dwarf2_init_section(&eh_frame,                fmap, ".eh_frame",     NULL,             &eh_frame_sect))
+        /* lld produces .eh_fram to avoid generating a long name */
+        dwarf2_init_section(&eh_frame,                fmap, ".eh_fram",      NULL,             &eh_frame_sect);
    dwarf2_init_section(&section[section_debug],  fmap, ".debug_info",   ".zdebug_info",   &debug_sect);
    dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", ".zdebug_abbrev", &debug_abbrev_sect);
    dwarf2_init_section(&section[section_string], fmap, ".debug_str",    ".zdebug_str",    &debug_str_sect);