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