OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line -... Line 1...
-   1 Index: elfutils-0.169/libdwfl/argp-std.c
-   2 ===================================================================
1 --- a/libdwfl/argp-std.c 3 --- elfutils-0.169.orig/libdwfl/argp-std.c
2 +++ b/libdwfl/argp-std.c 4 +++ elfutils-0.169/libdwfl/argp-std.c
3 @@ -56,9 +56,6 @@ static const struct argp_option options[ 5 @@ -56,9 +56,6 @@ static const struct argp_option options[
4 { "linux-process-map", 'M', "FILE", 0, 6 { "linux-process-map", 'M', "FILE", 0,
5 N_("Find addresses in files mapped as read from FILE" 7 N_("Find addresses in files mapped as read from FILE"
6 " in Linux /proc/PID/maps format"), 0 }, 8 " in Linux /proc/PID/maps format"), 0 },
7 - { "kernel", 'k', NULL, 0, N_("Find addresses in the running kernel"), 0 }, 9 - { "kernel", 'k', NULL, 0, N_("Find addresses in the running kernel"), 0 },
Line 24... Line 26...
24 - }; 26 - };
25 - 27 -
26 /* Structure held at state->HOOK. */ 28 /* Structure held at state->HOOK. */
27 struct parse_opt 29 struct parse_opt
28 { 30 {
29 @@ -226,43 +214,6 @@ parse_opt (int key, char *arg, struct ar 31 @@ -223,43 +211,6 @@ parse_opt (int key, char *arg, struct ar
30 } 32 }
31 break; 33 break;
Line 32... Line 34...
32 34
33 - case 'k': 35 - case 'k':
Line 36... Line 38...
36 - if (opt->dwfl == NULL) 38 - if (opt->dwfl == NULL)
37 - { 39 - {
38 - Dwfl *dwfl = INTUSE(dwfl_begin) (&kernel_callbacks); 40 - Dwfl *dwfl = INTUSE(dwfl_begin) (&kernel_callbacks);
39 - int result = INTUSE(dwfl_linux_kernel_report_kernel) (dwfl); 41 - int result = INTUSE(dwfl_linux_kernel_report_kernel) (dwfl);
40 - if (result != 0) 42 - if (result != 0)
41 - return fail (dwfl, result, _("cannot load kernel symbols"), state); 43 - return fail (dwfl, result, _("cannot load kernel symbols"));
42 - result = INTUSE(dwfl_linux_kernel_report_modules) (dwfl); 44 - result = INTUSE(dwfl_linux_kernel_report_modules) (dwfl);
43 - if (result != 0) 45 - if (result != 0)
44 - /* Non-fatal to have no modules since we do have the kernel. */ 46 - /* Non-fatal to have no modules since we do have the kernel. */
45 - argp_failure (state, 0, result, _("cannot find kernel modules")); 47 - failure (dwfl, result, _("cannot find kernel modules"));
46 - opt->dwfl = dwfl; 48 - opt->dwfl = dwfl;
47 - } 49 - }
48 - else 50 - else
49 - goto toomany; 51 - goto toomany;
50 - } 52 - }
Line 57... Line 59...
57 - { 59 - {
58 - Dwfl *dwfl = INTUSE(dwfl_begin) (&offline_callbacks); 60 - Dwfl *dwfl = INTUSE(dwfl_begin) (&offline_callbacks);
59 - int result = INTUSE(dwfl_linux_kernel_report_offline) (dwfl, arg, 61 - int result = INTUSE(dwfl_linux_kernel_report_offline) (dwfl, arg,
60 - NULL); 62 - NULL);
61 - if (result != 0) 63 - if (result != 0)
62 - return fail (dwfl, result, _("cannot find kernel or modules"), state); 64 - return fail (dwfl, result, _("cannot find kernel or modules"));
63 - opt->dwfl = dwfl; 65 - opt->dwfl = dwfl;
64 - } 66 - }
65 - else 67 - else
66 - goto toomany; 68 - goto toomany;
67 - } 69 - }
68 - break; 70 - break;
69 - 71 -
70 case ARGP_KEY_SUCCESS: 72 case ARGP_KEY_SUCCESS:
71 { 73 {
72 struct parse_opt *opt = state->hook; 74 struct parse_opt *opt = state->hook;
-   75 Index: elfutils-0.169/libdwfl/Makefile.in
-   76 ===================================================================
73 --- a/libdwfl/Makefile.am 77 --- elfutils-0.169.orig/libdwfl/Makefile.in
74 +++ b/libdwfl/Makefile.am 78 +++ elfutils-0.169/libdwfl/Makefile.in
75 @@ -49,7 +49,7 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en 79 @@ -120,7 +120,7 @@ am__libdwfl_a_SOURCES_DIST = dwfl_begin.
-   80 dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
76 argp-std.c find-debuginfo.c \ 81 dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
77 dwfl_build_id_find_elf.c \ 82 find-debuginfo.c dwfl_build_id_find_elf.c \
-   83 - dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
78 dwfl_build_id_find_debuginfo.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) \
79 - linux-kernel-modules.c linux-proc-maps.c \ 92 - linux-kernel-modules.$(OBJEXT) linux-proc-maps.$(OBJEXT) \
80 + linux-proc-maps.c \ 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 \
81 dwfl_addrmodule.c dwfl_addrdwarf.c \ 103 linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
82 cu.c dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \ 104 dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
83 dwfl_module_addrdie.c dwfl_addrdie.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@