]> git.ipfire.org Git - thirdparty/elfutils.git/commitdiff
Merge branch 'master' into portable
authorMark Wielaard <mjw@redhat.com>
Fri, 3 Jan 2014 21:42:46 +0000 (22:42 +0100)
committerMark Wielaard <mjw@redhat.com>
Fri, 3 Jan 2014 21:42:46 +0000 (22:42 +0100)
Adjusted libdwfl/linux-pid-attach.c for assume_ptrace_stopped.

17 files changed:
1  2 
ChangeLog
backends/ChangeLog
backends/Makefile.am
config/ChangeLog
configure.ac
lib/ChangeLog
libdw/ChangeLog
libdwfl/ChangeLog
libdwfl/linux-core-attach.c
libdwfl/linux-pid-attach.c
libebl/ChangeLog
src/ChangeLog
src/Makefile.am
src/addr2line.c
src/readelf.c
tests/ChangeLog
tests/backtrace.c

diff --cc ChangeLog
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
diff --cc lib/ChangeLog
Simple merge
diff --cc libdw/ChangeLog
Simple merge
Simple merge
Simple merge
index 32eceb205197d31e61a166a0cb3c60308c1df62b,58d6942fe7cf43e5351467674e66895d4b31eaaf..b8a3c3ed1aa2f268d62d1b1374f8fc94bec9abfc
@@@ -238,23 -266,15 +266,26 @@@ pid_thread_detach (Dwfl_Thread *thread
    pid_t tid = INTUSE(dwfl_thread_tid) (thread);
    assert (pid_arg->tid_attached == tid);
    pid_arg->tid_attached = 0;
-   // Older kernels (tested kernel-2.6.18-348.12.1.el5.x86_64) need special
-   // handling of the detachment to keep the process State: T (stopped).
-   if (pid_arg->tid_was_stopped)
-     syscall (__NR_tkill, tid, SIGSTOP);
-   /* This handling is needed only on older Linux kernels such as
-      2.6.32-358.23.2.el6.ppc64.  Later kernels such as 3.11.7-200.fc19.x86_64
-      remember the T (stopped) state themselves and no longer need to pass
-      SIGSTOP during PTRACE_DETACH.  */
-   ptrace (PTRACE_DETACH, tid, NULL,
-         (void *) (intptr_t) (pid_arg->tid_was_stopped ? SIGSTOP : 0));
-   if (pid_arg->tid_was_stopped)
+   if (! pid_arg->assume_ptrace_stopped)
      {
-       // Wait till the SIGSTOP settles down.
-       int i;
-       for (i = 0; i < 100000; i++)
-       if (linux_proc_pid_is_stopped (tid))
-         break;
++      // Older kernels (tested kernel-2.6.18-348.12.1.el5.x86_64) need special
++      // handling of the detachment to keep the process State: T (stopped).
++      if (pid_arg->tid_was_stopped)
++      syscall (__NR_tkill, tid, SIGSTOP);
+       /* This handling is needed only on older Linux kernels such as
 -         2.6.32-358.23.2.el6.ppc64.  Later kernels such as
 -         3.11.7-200.fc19.x86_64 remember the T (stopped) state
 -         themselves and no longer need to pass SIGSTOP during
 -         PTRACE_DETACH.  */
++         2.6.32-358.23.2.el6.ppc64.  Later kernels such as 3.11.7-200.fc19.x86_64
++         remember the T (stopped) state themselves and no longer need to pass
++         SIGSTOP during PTRACE_DETACH.  */
+       ptrace (PTRACE_DETACH, tid, NULL,
+             (void *) (intptr_t) (pid_arg->tid_was_stopped ? SIGSTOP : 0));
++      if (pid_arg->tid_was_stopped)
++      {
++        // Wait till the SIGSTOP settles down.
++        int i;
++        for (i = 0; i < 100000; i++)
++          if (linux_proc_pid_is_stopped (tid))
++            break;
++      }
      }
  }
  
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/addr2line.c
Simple merge
diff --cc src/readelf.c
Simple merge
diff --cc tests/ChangeLog
index ba6dab241c56c199871055bdcbad269cb06640f6,c68ae26cd6898c874ee6ed3caaf8e4aa87e02b9d..8f7ba8a6505483dce8fd6cc1034840a3c7f74ae7
+ 2014-01-03  Mark Wielaard  <mjw@redhat.com>
+       * run-addrcfi.sh: Add case for EM_AARCH64.
+       * testfileaarch64.bz2: New testfile.
+       * Makefile.am (EXTRA_DIST): Add testfilesaarch64.bz2.
+ 2013-12-30  Mark Wielaard  <mjw@redhat.com>
+       * backtrace-dwarf.c (report_pid): Explicitly call
+       dwfl_linux_proc_attach and check for errors.
+       * backtrace.c (report_pid): Likewise.
+ 2013-12-21  Mark Wielaard  <mjw@redhat.com>
+       * backtrace.c (callback_verify): Only assert that case 5 is the last
+       instruction of backtracegen on x86_64 native.
+ 2013-12-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
+           Mark Wielaard  <mjw@redhat.com>
+       * Makefile.am (EXTRA_DIST): Add testfile66.bz2, testfile66.core.bz2
+       and testfilebaz*ppc64*.bz2 files.
+       * dwflsyms.c (list_syms): Remove unused from parameter mod_name.  Print
+       error on dwfl_module_getsymtab error.
+       (list_syms): Use dwfl_module_getsym and dwfl_module_getsym_info.
+       Compare values for non-ET_REL. Use dwfl_module_addrinfo.
+       Also print section of actual value if different from sym.
+       * run-addrname-test.sh (testfile66, testfile66.core): New tests.
+       Test addr2line -x by showing different sections for address and
+       found name in testfile66.
+       * run-dwflsyms.sh (testfile66, testfile66.core, hello_ppc64.ko,
+       testfilebaz*ppc64): New tests.
+       * testfile66.bz2, testfile66.core.bz2, testfilebazdbgppc64.bz2,
+       testfilebazdbgppc64.debug.bz2, testfilebazdbgppc64_pl.bz2,
+       testfilebazdbgppc64_plr.bz2, testfilebazdynppc64.bz2,
+       testfilebazmdbppc64.bz2, testfilebazminppc64.bz2,
+       testfilebazminppc64_pl.bz2, testfilebazminppc64_plr.bz2,
+       testfilebaztabppc64.bz2: New test files.
+ 2013-12-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
+       unwinder: s390 and s390x
+       * Makefile.am (TESTS): Add run-backtrace-core-s390x.sh and
+       run-backtrace-core-s390.sh.
+       (EXTRA_DIST): Add backtrace.s390x.core.bz2, backtrace.s390x.exec.bz2,
+       backtrace.s390.core.bz2, backtrace.s390.exec.bz2,
+       run-backtrace-core-s390x.sh and run-backtrace-core-s390.sh.
+       * backtrace.s390.core.bz2: New file.
+       * backtrace.s390.exec.bz2: New file.
+       * backtrace.s390x.core.bz2: New file.
+       * backtrace.s390x.exec.bz2: New file.
+       * run-backtrace-core-s390.sh: New file.
+       * run-backtrace-core-s390x.sh: New file.
+ 2013-12-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+       * backtrace-dwarf.c (executable, find_elf, dwfl_offline): Remove unused
+       code.
+ 2013-12-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+       unwinder: ppc
+       * Makefile.am (TESTS): Add run-backtrace-core-ppc.sh.
+       (EXTRA_DIST): Add backtrace.ppc.core.bz2,
+       backtrace.ppc.exec.bz2 and run-backtrace-core-ppc.sh.
+       * backtrace.ppc.core.bz2: New file.
+       * backtrace.ppc.exec.bz2: New file.
+       * run-backtrace-core-ppc.sh: New file.
+ 2013-12-10  Mark Wielaard  <mjw@redhat.com>
+       * Makefile.am (backtrace_child_biarch_SOURCES): New backtrace-child.c.
+ 2013-12-10  Mark Wielaard  <mjw@redhat.com>
+       * Makefile.am (valgrind_cmd): Remove --trace-children=yes.
+       * backtrace-subr.sh (check_native_core): Disable valgrind while
+       dumping core.
+       * run-backtrace-data.sh: Disable valgrind.
+       * run-backtrace-dwarf.sh: Likewise.
+ 2013-12-09  Mark Wielaard  <mjw@redhat.com>
+       * varlocs.c (print_expr): Update comment to explain empty location
+       associated with DW_OP_GNU_implicit_pointer.
+ 2013-12-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
+       Fix test FAIL with -O2.
+       * backtrace-child.c (sigusr2): Add NOINLINE_NOCLONE and final asm stub.
+ 2013-12-05  Mark Wielaard  <mjw@redhat.com>
+       * backtrace-data.c (main): If unsupported also print to stderr.
+       * run-backtrace-dwarf.sh: Add check_unsupported and check_main.
+ 2013-12-04  Mark Wielaard  <mjw@redhat.com>
+       * Makefile.am (backtrace-child-biarch): Add $(EXEEXT).
 +2013-12-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +      Handle T-stopped detach for old kernels.
 +      * backtrace.c: Include sys/syscall.h.
 +      (linux_proc_pid_is_stopped): New function.
 +      (ptrace_detach_stopped): Handle old kernels.
 +
  2013-12-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
        * Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child,
Simple merge