101-no-fts.patch 4.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113
  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. -static const Dwfl_Callbacks kernel_callbacks =
  19. - {
  20. - .find_debuginfo = INTUSE(dwfl_standard_find_debuginfo),
  21. - .debuginfo_path = &debuginfo_path,
  22. -
  23. - .find_elf = INTUSE(dwfl_linux_kernel_find_elf),
  24. - .section_address = INTUSE(dwfl_linux_kernel_module_section_address),
  25. - };
  26. -
  27. /* Structure held at state->HOOK. */
  28. struct parse_opt
  29. {
  30. @@ -223,43 +211,6 @@ parse_opt (int key, char *arg, struct ar
  31. }
  32. break;
  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. Index: elfutils-0.169/libdwfl/Makefile.in
  74. ===================================================================
  75. --- elfutils-0.169.orig/libdwfl/Makefile.in
  76. +++ elfutils-0.169/libdwfl/Makefile.in
  77. @@ -120,7 +120,7 @@ am__libdwfl_a_SOURCES_DIST = dwfl_begin.
  78. dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
  79. dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
  80. find-debuginfo.c dwfl_build_id_find_elf.c \
  81. - dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
  82. + dwfl_build_id_find_debuginfo.c \
  83. linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
  84. dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
  85. dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
  86. @@ -148,7 +148,7 @@ am_libdwfl_a_OBJECTS = dwfl_begin.$(OBJE
  87. dwfl_validate_address.$(OBJEXT) argp-std.$(OBJEXT) \
  88. find-debuginfo.$(OBJEXT) dwfl_build_id_find_elf.$(OBJEXT) \
  89. dwfl_build_id_find_debuginfo.$(OBJEXT) \
  90. - linux-kernel-modules.$(OBJEXT) linux-proc-maps.$(OBJEXT) \
  91. + linux-proc-maps.$(OBJEXT) \
  92. dwfl_addrmodule.$(OBJEXT) dwfl_addrdwarf.$(OBJEXT) \
  93. cu.$(OBJEXT) dwfl_module_nextcu.$(OBJEXT) \
  94. dwfl_nextcu.$(OBJEXT) dwfl_cumodule.$(OBJEXT) \
  95. @@ -434,7 +434,7 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
  96. dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
  97. dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
  98. find-debuginfo.c dwfl_build_id_find_elf.c \
  99. - dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
  100. + dwfl_build_id_find_debuginfo.c \
  101. linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
  102. dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
  103. dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
  104. @@ -571,7 +571,6 @@ distclean-compile:
  105. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lines.Po@am__quote@
  106. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link_map.Po@am__quote@
  107. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-core-attach.Po@am__quote@
  108. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-kernel-modules.Po@am__quote@
  109. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-pid-attach.Po@am__quote@
  110. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-proc-maps.Po@am__quote@
  111. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzma.Po@am__quote@