libpthread: Fix inclusion of unwind code.
commit43a336e63f16c639e0e6fefdd7404509159c07b1
authorIgnacy Gawędzki <ignacy.gawedzki@green-communications.fr>
Thu, 6 Oct 2016 18:15:58 +0000 (6 20:15 +0200)
committerWaldemar Brodkorb <wbx@openadk.org>
Tue, 29 Nov 2016 07:39:15 +0000 (29 08:39 +0100)
tree926cd30d04e72d76ed3b0d23084a71eeb9c13fac
parentb433e2d9fccb17f9a2807403c339a7004e3d4f1b
libpthread: Fix inclusion of unwind code.

Since librt and libpthread are now integrated into libc, including
unwind-resume and unwind-forcedunwind implementations of unwind code
makes no sense.  Only unwind-forcedunwind is now included with
functions hidden to avoid them overriding the ones from libgcc_s.

* libpthread/nptl/sysdeps/generic/unwind-resume.h: New.  Define
  generic PERSONALITY_PROTO and PERSONALITY_ARGS and set
  HAVE_ARCH_UNWIND_RESUME to 0.

* libpthread/nptl/sysdeps/pthread/unwind-resume.c: Move...

* libpthread/nptl/sysdeps/generic/unwind-resume.c: ... here.  Include
  generic implementation of _Unwind_Resume on the condition that
  !HAVE_ARCH_UNWIND_RESUME.  Make functions hidden to prevent them
  from overriding libgcc_s's ones.

* libpthread/nptl/sysdeps/pthread/unwind-forcedunwind.c: Likewise.

* libpthread/nptl/sysdeps/arm/unwind-resume.h: New.  Define
  ARM-specific PERSONALITY_PROTO and PERSONALITY_ARGS and set
  HAVE_ARCH_UNWIND_RESUME to 1.

* libpthread/nptl/sysdeps/arm/arm-unwind-resume.c,
* libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c,
* libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c: New.
  ARM-specific implementations of _Unwind_Resume resp. for libc,
  libpthread and librt.

* libpthread/nptl/sysdeps/Makefile.commonarch: Remove both
  arm-unwind-resume and rt-arm-unwind-resume from
  libpthread_arch_CSRC.

* libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c,
* libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c: Remove.

Signed-off-by: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr>
libpthread/nptl/sysdeps/Makefile.commonarch
libpthread/nptl/sysdeps/arm/arm-unwind-resume.c [new file with mode: 0644]
libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c [new file with mode: 0644]
libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c [new file with mode: 0644]
libpthread/nptl/sysdeps/arm/unwind-resume.h [new file with mode: 0644]
libpthread/nptl/sysdeps/generic/unwind-resume.c [moved from libpthread/nptl/sysdeps/pthread/unwind-resume.c with 54% similarity]
libpthread/nptl/sysdeps/generic/unwind-resume.h [new file with mode: 0644]
libpthread/nptl/sysdeps/pthread/unwind-forcedunwind.c
libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c [deleted file]
libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c [deleted file]