patches/elfutils-no_fts.patch

   1 diff -Naur elfutils-0.152.orig/libdwfl/argp-std.c elfutils-0.152/libdwfl/argp-std.c
   2 --- elfutils-0.152.orig/libdwfl/argp-std.c      2010-06-29 04:09:31.000000000 +0000
   3 +++ elfutils-0.152/libdwfl/argp-std.c   2012-05-29 07:17:37.167069324 +0000
   4 @@ -73,9 +73,6 @@
   5    { "linux-process-map", 'M', "FILE", 0,
   6      N_("Find addresses in files mapped as read from FILE"
   7         " in Linux /proc/PID/maps format"), 0 },
   8 -  { "kernel", 'k', NULL, 0, N_("Find addresses in the running kernel"), 0 },
   9 -  { "offline-kernel", 'K', "RELEASE", OPTION_ARG_OPTIONAL,
  10 -    N_("Kernel with all modules"), 0 },
  11    { "debuginfo-path", OPT_DEBUGINFO, "PATH", 0,
  12      N_("Search path for separate debuginfo files"), 0 },
  13    { NULL, 0, NULL, 0, NULL, 0 }
  14 @@ -102,15 +99,6 @@
  15      .find_elf = INTUSE(dwfl_linux_proc_find_elf),
  16    };
  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  static error_t
  28  parse_opt (int key, char *arg, struct argp_state *state)
  29  {
  30 @@ -244,37 +232,6 @@
  31        }
  32        break;
  33
  34 -    case 'k':
  35 -      if (state->hook == NULL)
  36 -       {
  37 -         Dwfl *dwfl = INTUSE(dwfl_begin) (&kernel_callbacks);
  38 -         int result = INTUSE(dwfl_linux_kernel_report_kernel) (dwfl);
  39 -         if (result != 0)
  40 -           return fail (dwfl, result, _("cannot load kernel symbols"));
  41 -         result = INTUSE(dwfl_linux_kernel_report_modules) (dwfl);
  42 -         if (result != 0)
  43 -           /* Non-fatal to have no modules since we do have the kernel.  */
  44 -           failure (dwfl, result, _("cannot find kernel modules"));
  45 -         state->hook = dwfl;
  46 -       }
  47 -      else
  48 -       goto toomany;
  49 -      break;
  50 -
  51 -    case 'K':
  52 -      if (state->hook == NULL)
  53 -       {
  54 -         Dwfl *dwfl = INTUSE(dwfl_begin) (&offline_callbacks);
  55 -         int result = INTUSE(dwfl_linux_kernel_report_offline) (dwfl, arg,
  56 -                                                                NULL);
  57 -         if (result != 0)
  58 -           return fail (dwfl, result, _("cannot find kernel or modules"));
  59 -         state->hook = dwfl;
  60 -       }
  61 -      else
  62 -       goto toomany;
  63 -      break;
  64 -
  65      case ARGP_KEY_SUCCESS:
  66        {
  67         Dwfl *dwfl = state->hook;
  68 diff -Naur elfutils-0.152.orig/libdwfl/Makefile.in elfutils-0.152/libdwfl/Makefile.in
  69 --- elfutils-0.152.orig/libdwfl/Makefile.in     2011-02-15 14:30:25.000000000 +0000
  70 +++ elfutils-0.152/libdwfl/Makefile.in  2012-05-29 07:16:06.645155215 +0000
  71 @@ -67,7 +67,7 @@
  72         dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
  73         dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
  74         find-debuginfo.c dwfl_build_id_find_elf.c \
  75 -       dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
  76 +       dwfl_build_id_find_debuginfo.c \
  77         linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
  78         dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
  79         dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
  80 @@ -95,7 +95,7 @@
  81         dwfl_validate_address.$(OBJEXT) argp-std.$(OBJEXT) \
  82         find-debuginfo.$(OBJEXT) dwfl_build_id_find_elf.$(OBJEXT) \
  83         dwfl_build_id_find_debuginfo.$(OBJEXT) \
  84 -       linux-kernel-modules.$(OBJEXT) linux-proc-maps.$(OBJEXT) \
  85 +       linux-proc-maps.$(OBJEXT) \
  86         dwfl_addrmodule.$(OBJEXT) dwfl_addrdwarf.$(OBJEXT) \
  87         cu.$(OBJEXT) dwfl_module_nextcu.$(OBJEXT) \
  88         dwfl_nextcu.$(OBJEXT) dwfl_cumodule.$(OBJEXT) \
  89 @@ -293,7 +293,7 @@
  90         dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
  91         dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
  92         find-debuginfo.c dwfl_build_id_find_elf.c \
  93 -       dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
  94 +       dwfl_build_id_find_debuginfo.c \
  95         linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
  96         dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
  97         dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
  98 @@ -424,7 +424,6 @@
  99  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdwfl_crc32_file.Po@am__quote@
 100  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lines.Po@am__quote@
 101  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link_map.Po@am__quote@
 102 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-kernel-modules.Po@am__quote@
 103  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-proc-maps.Po@am__quote@
 104  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzma.Po@am__quote@
 105  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/offline.Po@am__quote@
 106