From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9252 invoked by alias); 7 May 2003 19:39:21 -0000 Mailing-List: contact gcc-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Archive: List-Post: List-Help: Sender: gcc-owner@gcc.gnu.org Received: (qmail 9230 invoked from network); 7 May 2003 19:39:21 -0000 Received: from unknown (HELO faui11.informatik.uni-erlangen.de) (131.188.31.2) by sources.redhat.com with SMTP; 7 May 2003 19:39:21 -0000 Received: (from weigand@localhost) by faui11.informatik.uni-erlangen.de (8.9.1/8.1.4-FAU) id VAA15626; Wed, 7 May 2003 21:39:16 +0200 (MET DST) From: Ulrich Weigand Message-Id: <200305071939.VAA15626@faui11.informatik.uni-erlangen.de> Subject: Re: GCC 3.3 Prelease broken on s390 To: mark@codesourcery.com (Mark Mitchell) Date: Wed, 07 May 2003 19:39:00 -0000 Cc: rth@redhat.com, gcc@gcc.gnu.org, gcc-patches@gcc.gnu.org In-Reply-To: <1052327506.23765.49.camel@minax.codesourcery.com> from "Mark Mitchell" at May 07, 2003 10:11:46 AM MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-SW-Source: 2003-05/txt/msg00691.txt.bz2 Mark Mitchell wrote: > Yes -- but please enclose the second hunk in #ifdef as well. If we're > going to be ugly, let's not try to be smart while we're being ugly. Fine with me. > Please check this in, and close the PR. For the record, I've checked in the patch below and closed the PR. Bye, Ulrich Index: gcc/ChangeLog =================================================================== RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v retrieving revision 1.16114.2.511 diff -c -p -r1.16114.2.511 ChangeLog *** gcc/ChangeLog 7 May 2003 06:02:01 -0000 1.16114.2.511 --- gcc/ChangeLog 7 May 2003 19:26:21 -0000 *************** *** 1,3 **** --- 1,9 ---- + 2003-05-06 Ulrich Weigand + + PR other/10650 + * unwind-dw2.c (uw_update_context_1): Don't set sp as cfa on s390. + (uw_init_context_1): Set initial sp to outer cfa on s390. + 2003-05-06 Mark Mitchell PR other/10658 Index: gcc/unwind-dw2.c =================================================================== RCS file: /cvs/gcc/gcc/gcc/unwind-dw2.c,v retrieving revision 1.22.2.4 diff -c -p -r1.22.2.4 unwind-dw2.c *** gcc/unwind-dw2.c 5 May 2003 16:59:21 -0000 1.22.2.4 --- gcc/unwind-dw2.c 7 May 2003 19:26:21 -0000 *************** uw_update_context_1 (struct _Unwind_Cont *** 1062,1069 **** --- 1062,1071 ---- Given that other unwind mechanisms generally won't work if you try to represent stack pointer saves and restores directly, we don't bother conditionalizing this at all. */ + #ifndef __s390__ tmp_sp = (_Unwind_Ptr) context->cfa; orig_context.reg[__builtin_dwarf_sp_column ()] = &tmp_sp; + #endif /* Compute this frame's CFA. */ switch (fs->cfa_how) *************** uw_init_context_1 (struct _Unwind_Contex *** 1164,1169 **** --- 1166,1174 ---- /* Force the frame state to use the known cfa value. */ context->cfa = outer_cfa; + #ifdef __s390__ + context->reg[__builtin_dwarf_sp_column ()] = &outer_cfa; + #endif fs.cfa_how = CFA_REG_OFFSET; fs.cfa_reg = __builtin_dwarf_sp_column (); fs.cfa_offset = 0; -- Dr. Ulrich Weigand weigand@informatik.uni-erlangen.de