Merge branch 'master' into portable

Conflicts:
	libdwfl/ChangeLog
	libdwfl/linux-pid-attach.c

diff --cc libdwfl/ChangeLog
index 03794d3b4a84466fed27a4276697b3c54bf6fa87,990138051a8cf40eebfe7d0a9a4fb6a764c53ecc..50b5d68be1afd43034de4f9c9ea97346adc46915
--- 1/libdwfl/ChangeLog
--- 2/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@@ -1,18 -1,43 +1,58 @@@
+ 2013-11-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       Code cleanup: Remove const in prototype
+       * dwfl_frame_regs.c (dwfl_thread_state_registers): Remove const from
+       firstreg.
+       * libdwfl.h (dwfl_thread_state_registers): Likewise.
+       * linux-pid-attach.c (pid_thread_state_registers_cb): Likewise.
+ 
+ 2013-11-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       Fix dwfl_attach_state machine->elf.
+       * dwfl_frame.c (dwfl_attach_state): Change parameter machine to elf.
+       Call ebl_openbackend instead of ebl_openbackend_machine.
+       * libdwfl.h (dwfl_attach_state): Change parameter machine to elf.
+       Update the function description.
+       * linux-core-attach.c (__libdwfl_attach_state_for_core): Pass CORE to
+       dwfl_attach_state.
+       * linux-pid-attach.c (__libdwfl_attach_state_for_pid): Pass NULL to
+       dwfl_attach_state.
+ 
+ 2013-11-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       Provide __libdwfl_module_getsym to get dwfl_file *.
+       * dwfl_module_addrsym.c (dwfl_module_addrsym) (i_to_symfile): Remove.
+       (dwfl_module_addrsym) (search_table): New variable file.  Use
+       __libdwfl_module_getsym.  Use file.
+       * dwfl_module_getsym.c (dwfl_module_getsym): Rename to ...
+       (__libdwfl_module_getsym): ... here.  Add parameter filep.  Set it.
+       (dwfl_module_getsym): New wrapper.
+       * libdwflP.h (__libdwfl_module_getsym): New declaration.
+ 
+ 2013-11-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       Fix dwfl_module_addrsym for minidebuginfo.
+       * dwfl_module_addrsym.c (dwfl_module_addrsym): New variable
+       addr_symfile.
+       (dwfl_module_addrsym) (same_section): Use it.
+       (dwfl_module_addrsym) (i_to_symfile): New function.
+       (dwfl_module_addrsym) (search_table): Use it.
+ 
 +2013-11-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +      Older OS compatibility bits.
 +      * linux-core-attach.c (be64toh, le64toh, be32toh, le32toh): Provide
 +      fallbacks if not defined by system.
 +
 +2013-11-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +      Handle T-stopped detach for old kernels.
 +      * linux-pid-attach.c (struct pid_arg): New field stopped.
 +      (ptrace_attach): New parameter stoppedp.  Set it appropriately.
 +      (pid_set_initial_registers): Pass the new field.
 +      (pid_thread_detach): Handle the case of STOPPED for old kernels.
 +      (__libdwfl_attach_state_for_pid): Initialize STOPPED.
 +
  2013-11-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
            Mark Wielaard  <mjw@redhat.com>
  

diff --cc libdwfl/linux-core-attach.c
Simple merge

diff --cc libdwfl/linux-pid-attach.c
index efdeb9fe313062a4e11ad3a1aa534037091300ff,ca8214467184838cb5cd229fbc5bc052203c9616..fd2925010b6c966286dce891d25028f8fef5b983
--- 1/libdwfl/linux-pid-attach.c
--- 2/libdwfl/linux-pid-attach.c
+++ b/libdwfl/linux-pid-attach.c
@@@ -287,8 -269,7 +285,8 @@@ __libdwfl_attach_state_for_pid (Dwfl *d
      }
    pid_arg->dir = dir;
    pid_arg->tid_attached = 0;
-   if (! INTUSE(dwfl_attach_state) (dwfl, EM_NONE, pid, &pid_thread_callbacks,
 +  pid_arg->stopped = false;
+   if (! INTUSE(dwfl_attach_state) (dwfl, NULL, pid, &pid_thread_callbacks,
                                   pid_arg))
      {
        closedir (dir);

diff --cc libebl/ChangeLog
Simple merge

diff --cc libelf/ChangeLog
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc tests/ChangeLog
Simple merge