Merge branch 'jankratochvil/s390-core' into jankratochvil/forunwind

Conflicts:
	backends/ChangeLog
	tests/Makefile.am

diff --cc backends/ChangeLog
index f1c6be7ed5ff28b4f31dfdaf09a1dae9ba8c6614,388e22e1a93e943f4334feedbc98c1bef743c1a9..f179041a4bda3912905a2a88c441180443ec1bfa
--- 1/backends/ChangeLog
--- 2/backends/ChangeLog
+++ b/backends/ChangeLog
@@@ -1,23 -1,16 +1,36 @@@
 +2012-10-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +          Roland McGrath <roland@hack.frob.com>
 +
 +      * Makefile.am (s390_SRCS): Add s390_corenote.c and s390x_corenote.c.
 +      * linux-core-note.c (ALIGN_PR_REG): New definitions.
 +      (struct EBLHOOK(prstatus)): Change field pr_reg to anonymous union with
 +      ALIGN_PR_REG.
 +      (EXTRA_ITEMS): New macro.
 +      * s390_corenote.c: New file.
 +      * s390_init.c (s390x_core_note): New declaration.
 +      (s390_init): Install s390x_core_note and s390_core_note.
 +      * s390x_corenote.c: New file.
 +
 +2012-10-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +      * Makefile.am (INCLUDES): Add libdwfl.
 +      (ppc64_SRCS): Add ppc64_get_func_pc.c.
 +      * ppc64_get_func_pc.c: New file.
 +      * ppc64_init.c (ppc64_init): Install get_func_pc and destr.
 +
+ 2012-10-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+           Roland McGrath <roland@hack.frob.com>
+ 
+       * Makefile.am (s390_SRCS): Add s390_corenote.c and s390x_corenote.c.
+       * linux-core-note.c (ALIGN_PR_REG): New definitions.
+       (struct EBLHOOK(prstatus)): Change field pr_reg to anonymous union with
+       ALIGN_PR_REG.
+       (EXTRA_ITEMS): New macro.
+       * s390_corenote.c: New file.
+       * s390_init.c (s390x_core_note): New declaration.
+       (s390_init): Install s390x_core_note and s390_core_note.
+       * s390x_corenote.c: New file.
+ 
  2012-10-12  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
        * linux-core-note.c (prstatus_items): Rename groups of sigpend and

diff --cc tests/ChangeLog
index 403c7853bf61cb22c08bad7b7a75871485c25202,9a2133402bdfe64223df24af6ad51e54e5e64c8b..c1d56db3d73368fec1bdd0a51580f72482a3e62f
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,28 -1,11 +1,36 @@@
 +2012-10-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +    
 +      * run-addrname-test.sh: New testcase for ppc64 function descriptors.
 +      * testfile66.bz2: New file.
 +      * Makefile.am (EXTRA_DIST): Add testfile66.bz2.
 +
 +2012-10-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +      * Makefile.am (check_PROGRAMS): Add dwfl-report-elf-align.
 +      (TESTS): Add run-dwfl-report-elf-align.sh.
 +      (EXTRA_DIST): Add run-dwfl-report-elf-align.sh and
 +      testfile-dwfl-report-elf-align-shlib.so.bz2 .
 +      (dwfl_report_elf_align_LDADD): New.
 +      * dwfl-report-elf-align.c: New file.
 +      * run-dwfl-report-elf-align.sh: New file.
 +      * testfile-dwfl-report-elf-align-shlib.so.bz2: New file.
 +
 +2012-10-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +      * run-addrname-test.sh: New test for PIE relocation.
 +      * testfile70.core.bz2: New file.
 +      * testfile70.exec.bz2: New file.
 +      * Makefile.am (EXTRA_DIST): Add testfile70.core.bz2 and
 +      testfile70.exec.bz2 .
 +
+ 2012-10-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       * run-readelf-mixed-corenote.sh: New testcase for readelf -n of s390
+       and s390x core notes.
+       * testfile67.bz2: New file.
+       * testfile68.bz2: New file.
+       * Makefile.am (EXTRA_DIST): Add testfile67.bz2 and testfile68.bz2 .
+ 
  2012-10-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
        * Makefile.am (EXTRA_DIST): Add testfile64.bz2, testfile65.bz2,

diff --cc tests/Makefile.am
index 0623a0fbd07a6113ae0f595e4c71853a5c67ba1b,f6e0d672f0d3fb54d3dbbf1d86fafc3659507131..02d677b2ccf3263d7d9e5181340cc3c7c42b64d2
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -180,10 -180,8 +180,10 @@@ EXTRA_DIST = run-arextract.sh run-arsym
             testfile60.bz2 testfile61.bz2 \
             run-readelf-vmcoreinfo.sh testfile62.bz2 \
             run-readelf-mixed-corenote.sh testfile63.bz2 testfile64.bz2 \
-            testfile65.bz2 testfile66.bz2 testfile69.core.bz2 \
-            testfile69.so.bz2 testfile70.core.bz2 testfile70.exec.bz2 \
-            run-dwfl-report-elf-align.sh \
 -           testfile65.bz2 testfile69.core.bz2 testfile69.so.bz2 \
 -           testfile67.bz2 testfile68.bz2
++           testfile65.bz2 testfile66.bz2 testfile67.bz2 testfile68.bz2 \
++           testfile69.core.bz2 testfile69.so.bz2 testfile70.core.bz2 \
++           testfile70.exec.bz2 run-dwfl-report-elf-align.sh \
 +           testfile-dwfl-report-elf-align-shlib.so.bz2
  
  if USE_VALGRIND
  valgrind_cmd="valgrind -q --trace-children=yes --error-exitcode=1"