2
0

101-no-fts.patch 4.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109
  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. -static const Dwfl_Callbacks kernel_callbacks =
  17. - {
  18. - .find_debuginfo = INTUSE(dwfl_standard_find_debuginfo),
  19. - .debuginfo_path = &debuginfo_path,
  20. -
  21. - .find_elf = INTUSE(dwfl_linux_kernel_find_elf),
  22. - .section_address = INTUSE(dwfl_linux_kernel_module_section_address),
  23. - };
  24. -
  25. /* Structure held at state->HOOK. */
  26. struct parse_opt
  27. {
  28. @@ -219,43 +207,6 @@ parse_opt (int key, char *arg, struct ar
  29. }
  30. break;
  31. - case 'k':
  32. - {
  33. - struct parse_opt *opt = state->hook;
  34. - if (opt->dwfl == NULL)
  35. - {
  36. - Dwfl *dwfl = INTUSE(dwfl_begin) (&kernel_callbacks);
  37. - int result = INTUSE(dwfl_linux_kernel_report_kernel) (dwfl);
  38. - if (result != 0)
  39. - return fail (dwfl, result, _("cannot load kernel symbols"));
  40. - result = INTUSE(dwfl_linux_kernel_report_modules) (dwfl);
  41. - if (result != 0)
  42. - /* Non-fatal to have no modules since we do have the kernel. */
  43. - failure (dwfl, result, _("cannot find kernel modules"));
  44. - opt->dwfl = dwfl;
  45. - }
  46. - else
  47. - goto toomany;
  48. - }
  49. - break;
  50. -
  51. - case 'K':
  52. - {
  53. - struct parse_opt *opt = state->hook;
  54. - if (opt->dwfl == NULL)
  55. - {
  56. - Dwfl *dwfl = INTUSE(dwfl_begin) (&offline_callbacks);
  57. - int result = INTUSE(dwfl_linux_kernel_report_offline) (dwfl, arg,
  58. - NULL);
  59. - if (result != 0)
  60. - return fail (dwfl, result, _("cannot find kernel or modules"));
  61. - opt->dwfl = dwfl;
  62. - }
  63. - else
  64. - goto toomany;
  65. - }
  66. - break;
  67. -
  68. case ARGP_KEY_SUCCESS:
  69. {
  70. struct parse_opt *opt = state->hook;
  71. --- a/libdwfl/Makefile.in
  72. +++ b/libdwfl/Makefile.in
  73. @@ -120,7 +120,7 @@ am__libdwfl_a_SOURCES_DIST = dwfl_begin.
  74. dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
  75. dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
  76. find-debuginfo.c dwfl_build_id_find_elf.c \
  77. - dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
  78. + dwfl_build_id_find_debuginfo.c \
  79. linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
  80. dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
  81. dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
  82. @@ -148,7 +148,7 @@ am_libdwfl_a_OBJECTS = dwfl_begin.$(OBJE
  83. dwfl_validate_address.$(OBJEXT) argp-std.$(OBJEXT) \
  84. find-debuginfo.$(OBJEXT) dwfl_build_id_find_elf.$(OBJEXT) \
  85. dwfl_build_id_find_debuginfo.$(OBJEXT) \
  86. - linux-kernel-modules.$(OBJEXT) linux-proc-maps.$(OBJEXT) \
  87. + linux-proc-maps.$(OBJEXT) \
  88. dwfl_addrmodule.$(OBJEXT) dwfl_addrdwarf.$(OBJEXT) \
  89. cu.$(OBJEXT) dwfl_module_nextcu.$(OBJEXT) \
  90. dwfl_nextcu.$(OBJEXT) dwfl_cumodule.$(OBJEXT) \
  91. @@ -434,7 +434,7 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
  92. dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
  93. dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
  94. find-debuginfo.c dwfl_build_id_find_elf.c \
  95. - dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
  96. + dwfl_build_id_find_debuginfo.c \
  97. linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
  98. dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
  99. dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
  100. @@ -571,7 +571,6 @@ distclean-compile:
  101. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lines.Po@am__quote@
  102. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link_map.Po@am__quote@
  103. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-core-attach.Po@am__quote@
  104. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-kernel-modules.Po@am__quote@
  105. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-pid-attach.Po@am__quote@
  106. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-proc-maps.Po@am__quote@
  107. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzma.Po@am__quote@