From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1118) id 0E7B73858001; Sun, 6 Mar 2022 16:01:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E7B73858001 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: John David Anglin To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] nptl: Fix cleanups for stack grows up [BZ# 28899] X-Act-Checkin: glibc X-Git-Author: John David Anglin X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: f610d2935f041c5f41ddcb96924ea42ca2fb5ea5 X-Git-Newrev: 40fc6a74ee3dd600c84d311d91cbb16962f11a71 Message-Id: <20220306160128.0E7B73858001@sourceware.org> Date: Sun, 6 Mar 2022 16:01:28 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Mar 2022 16:01:28 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=40fc6a74ee3dd600c84d311d91cbb16962f11a71 commit 40fc6a74ee3dd600c84d311d91cbb16962f11a71 Author: John David Anglin Date: Mon Feb 28 15:47:38 2022 +0000 nptl: Fix cleanups for stack grows up [BZ# 28899] _STACK_GROWS_DOWN is defined to 0 when the stack grows up. The code in unwind.c used `#ifdef _STACK_GROWS_DOWN' to selct the stack grows down define for FRAME_LEFT. As a result, the _STACK_GROWS_DOWN define was always selected and cleanups were incorrectly sequenced when the stack grows up. (cherry picked from commit 2bbc694df279020a6620096d31c1e05c93966f9b) Diff: --- nptl/unwind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nptl/unwind.c b/nptl/unwind.c index f50997f728..404fab46d0 100644 --- a/nptl/unwind.c +++ b/nptl/unwind.c @@ -27,7 +27,7 @@ #include #include -#ifdef _STACK_GROWS_DOWN +#if _STACK_GROWS_DOWN # define FRAME_LEFT(frame, other, adj) \ ((uintptr_t) frame - adj >= (uintptr_t) other - adj) #elif _STACK_GROWS_UP