Fresh pull from upstream
[librecmc/librecmc.git] / package / libs / elfutils / patches / 101-no-fts.patch
1 --- a/libdwfl/argp-std.c
2 +++ b/libdwfl/argp-std.c
3 @@ -52,9 +52,6 @@ static const struct argp_option options[
4    { "linux-process-map", 'M', "FILE", 0,
5      N_("Find addresses in files mapped as read from FILE"
6         " in Linux /proc/PID/maps format"), 0 },
7 -  { "kernel", 'k', NULL, 0, N_("Find addresses in the running kernel"), 0 },
8 -  { "offline-kernel", 'K', "RELEASE", OPTION_ARG_OPTIONAL,
9 -    N_("Kernel with all modules"), 0 },
10    { "debuginfo-path", OPT_DEBUGINFO, "PATH", 0,
11      N_("Search path for separate debuginfo files"), 0 },
12    { NULL, 0, NULL, 0, NULL, 0 }
13 @@ -81,15 +78,6 @@ static const Dwfl_Callbacks proc_callbac
14      .find_elf = INTUSE(dwfl_linux_proc_find_elf),
15    };
16  
17 -static const Dwfl_Callbacks kernel_callbacks =
18 -  {
19 -    .find_debuginfo = INTUSE(dwfl_standard_find_debuginfo),
20 -    .debuginfo_path = &debuginfo_path,
21 -
22 -    .find_elf = INTUSE(dwfl_linux_kernel_find_elf),
23 -    .section_address = INTUSE(dwfl_linux_kernel_module_section_address),
24 -  };
25 -
26  /* Structure held at state->HOOK.  */
27  struct parse_opt
28  {
29 @@ -219,43 +207,6 @@ parse_opt (int key, char *arg, struct ar
30        }
31        break;
32  
33 -    case 'k':
34 -      {
35 -       struct parse_opt *opt = state->hook;
36 -       if (opt->dwfl == NULL)
37 -         {
38 -           Dwfl *dwfl = INTUSE(dwfl_begin) (&kernel_callbacks);
39 -           int result = INTUSE(dwfl_linux_kernel_report_kernel) (dwfl);
40 -           if (result != 0)
41 -             return fail (dwfl, result, _("cannot load kernel symbols"));
42 -           result = INTUSE(dwfl_linux_kernel_report_modules) (dwfl);
43 -           if (result != 0)
44 -             /* Non-fatal to have no modules since we do have the kernel.  */
45 -             failure (dwfl, result, _("cannot find kernel modules"));
46 -           opt->dwfl = dwfl;
47 -         }
48 -       else
49 -         goto toomany;
50 -      }
51 -      break;
52 -
53 -    case 'K':
54 -      {
55 -       struct parse_opt *opt = state->hook;
56 -       if (opt->dwfl == NULL)
57 -         {
58 -           Dwfl *dwfl = INTUSE(dwfl_begin) (&offline_callbacks);
59 -           int result = INTUSE(dwfl_linux_kernel_report_offline) (dwfl, arg,
60 -                                                                  NULL);
61 -           if (result != 0)
62 -             return fail (dwfl, result, _("cannot find kernel or modules"));
63 -           opt->dwfl = dwfl;
64 -         }
65 -       else
66 -         goto toomany;
67 -      }
68 -      break;
69 -
70      case ARGP_KEY_SUCCESS:
71        {
72         struct parse_opt *opt = state->hook;
73 --- a/libdwfl/Makefile.in
74 +++ b/libdwfl/Makefile.in
75 @@ -120,7 +120,7 @@ am__libdwfl_a_SOURCES_DIST = dwfl_begin.
76         dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
77         dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
78         find-debuginfo.c dwfl_build_id_find_elf.c \
79 -       dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
80 +       dwfl_build_id_find_debuginfo.c \
81         linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
82         dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
83         dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
84 @@ -148,7 +148,7 @@ am_libdwfl_a_OBJECTS = dwfl_begin.$(OBJE
85         dwfl_validate_address.$(OBJEXT) argp-std.$(OBJEXT) \
86         find-debuginfo.$(OBJEXT) dwfl_build_id_find_elf.$(OBJEXT) \
87         dwfl_build_id_find_debuginfo.$(OBJEXT) \
88 -       linux-kernel-modules.$(OBJEXT) linux-proc-maps.$(OBJEXT) \
89 +       linux-proc-maps.$(OBJEXT) \
90         dwfl_addrmodule.$(OBJEXT) dwfl_addrdwarf.$(OBJEXT) \
91         cu.$(OBJEXT) dwfl_module_nextcu.$(OBJEXT) \
92         dwfl_nextcu.$(OBJEXT) dwfl_cumodule.$(OBJEXT) \
93 @@ -434,7 +434,7 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
94         dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
95         dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
96         find-debuginfo.c dwfl_build_id_find_elf.c \
97 -       dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
98 +       dwfl_build_id_find_debuginfo.c \
99         linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
100         dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
101         dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
102 @@ -571,7 +571,6 @@ distclean-compile:
103  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lines.Po@am__quote@
104  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link_map.Po@am__quote@
105  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-core-attach.Po@am__quote@
106 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-kernel-modules.Po@am__quote@
107  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-pid-attach.Po@am__quote@
108  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-proc-maps.Po@am__quote@
109  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzma.Po@am__quote@