From patchwork Wed Sep 26 09:31:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 29541 Received: (qmail 13845 invoked by alias); 26 Sep 2018 09:31:56 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 13042 invoked by uid 89); 26 Sep 2018 09:31:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS autolearn=ham version=3.3.2 spammy=endless X-HELO: mx1.suse.de From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Add missing unwind information to ld.so on powerpc32 (bug 23707) X-Yow: Ha ha Ha ha Ha ha Ha Ha Ha Ha -- When will I EVER stop HAVING FUN?!! Date: Wed, 26 Sep 2018 11:31:51 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 [BZ #23707] * sysdeps/powerpc/powerpc32/dl-start.S: Add unwind information. * elf/Makefile (tests): Add tst-unwind-ctor. (modules-names): Add tst-unwind-ctor-lib. ($(objpfx)tst-unwind-ctor): Depend on $(objpfx)tst-unwind-ctor-lib.so. --- elf/Makefile | 7 +++-- elf/tst-unwind-ctor-lib.c | 41 ++++++++++++++++++++++++++++ elf/tst-unwind-ctor.c | 25 +++++++++++++++++ sysdeps/powerpc/powerpc32/dl-start.S | 3 ++ 4 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 elf/tst-unwind-ctor-lib.c create mode 100644 elf/tst-unwind-ctor.c diff --git a/elf/Makefile b/elf/Makefile index 037f68165b..455ec730fc 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -186,7 +186,8 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-tlsalign tst-tlsalign-extern tst-nodelete-opened \ tst-nodelete2 tst-audit11 tst-audit12 tst-dlsym-error tst-noload \ tst-latepthread tst-tls-manydynamic tst-nodelete-dlclose \ - tst-debug1 tst-main1 tst-absolute-sym tst-absolute-zero tst-big-note + tst-debug1 tst-main1 tst-absolute-sym tst-absolute-zero tst-big-note \ + tst-unwind-ctor # reldep9 tests-internal += loadtest unload unload2 circleload1 \ neededtest neededtest2 neededtest3 neededtest4 \ @@ -273,7 +274,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-latepthreadmod $(tst-tls-many-dynamic-modules) \ tst-nodelete-dlclose-dso tst-nodelete-dlclose-plugin \ tst-main1mod tst-libc_dlvsym-dso tst-absolute-sym-lib \ - tst-absolute-zero-lib tst-big-note-lib + tst-absolute-zero-lib tst-big-note-lib tst-unwind-ctor-lib # Most modules build with _ISOMAC defined, but those filtered out # depend on internal headers. modules-names-tests = $(filter-out ifuncmod% tst-libc_dlvsym-dso tst-tlsmod%,\ @@ -1492,3 +1493,5 @@ tst-libc_dlvsym-static-ENV = \ $(objpfx)tst-libc_dlvsym-static.out: $(objpfx)tst-libc_dlvsym-dso.so $(objpfx)tst-big-note: $(objpfx)tst-big-note-lib.so + +$(objpfx)tst-unwind-ctor: $(objpfx)tst-unwind-ctor-lib.so diff --git a/elf/tst-unwind-ctor-lib.c b/elf/tst-unwind-ctor-lib.c new file mode 100644 index 0000000000..f517e43ec4 --- /dev/null +++ b/elf/tst-unwind-ctor-lib.c @@ -0,0 +1,41 @@ +/* Unit test for _Unwind_Backtrace in a shared object constructor. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +static _Unwind_Reason_Code +callback (struct _Unwind_Context *ctx, void *arg) +{ + return _URC_NO_REASON; +} + +static void +__attribute__ ((constructor)) +do_unwind (void) +{ + /* Arrange for this test to be killed if _Unwind_Backtrace runs into an + endless loop. */ + alarm (20); + _Unwind_Backtrace (callback, 0); +} + +void +dummy (void) +{ +} diff --git a/elf/tst-unwind-ctor.c b/elf/tst-unwind-ctor.c new file mode 100644 index 0000000000..96100527b2 --- /dev/null +++ b/elf/tst-unwind-ctor.c @@ -0,0 +1,25 @@ +/* Unit test for _Unwind_Backtrace in a shared object constructor. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +extern void dummy (void); + +int +main (void) +{ + dummy (); +} diff --git a/sysdeps/powerpc/powerpc32/dl-start.S b/sysdeps/powerpc/powerpc32/dl-start.S index 244d87fb6d..243fb8352b 100644 --- a/sysdeps/powerpc/powerpc32/dl-start.S +++ b/sysdeps/powerpc/powerpc32/dl-start.S @@ -34,6 +34,9 @@ ENTRY(_start) _dl_start to save the link register). */ li r4,0 addi r1,r1,-16 + cfi_adjust_cfa_offset (16) +/* Mark lr as undefined to stop unwinding. */ + cfi_undefined (lr) stw r4,0(r1) bl _dl_start@local