From patchwork Sat Sep 21 19:51:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 1165654 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-509405-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sandoe.co.uk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="H6EbBvip"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46bLnC5fphz9sDB for ; Sun, 22 Sep 2019 05:51:25 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:content-transfer-encoding:mime-version:subject :message-id:date:to; q=dns; s=default; b=SMkp/pWtMTGDsEXhNdOa/dn 2xzJbPtFls40uF7JkTW1BExAs4SSV7VCu3TBm/57WPoz8LkjD1+ZQvuHlFzVBQ5u 2cz+I9VtV9Tm3RqPuidyha6GhTb+h7vZ+AWvpo8llQABEyCrh1KwoOE2TnTwgnHb OsjlUN3E7Lp+iMKh3nNQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:content-transfer-encoding:mime-version:subject :message-id:date:to; s=default; bh=1OAedol76M0l0gxoFE1OzpjSCGg=; b= H6EbBvipOzP7xBP5lq9Xz7VI/7/nyfCwuUAOge5vJRntMmmz0I9FmFy47cCDZiOd Qizfku/LP67w9bhswNesf89Ry/nkendyv7VR0rE4WrHZeb9ep+KKQjaDQMfAI9Ey xmON2zelkU4ocOGzWnbGWnij24hJM4THso0Q1nk8foU= Received: (qmail 45876 invoked by alias); 21 Sep 2019 19:51:16 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 45868 invoked by uid 89); 21 Sep 2019 19:51:16 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_COUK, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=Darwin, HX-Spam-Relays-External:ESMTPA X-HELO: smtp2.wavenetuk.net Received: from smtp.wavenetuk.net (HELO smtp2.wavenetuk.net) (195.26.37.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 21 Sep 2019 19:51:15 +0000 Received: from [192.168.1.212] (host81-138-1-83.in-addr.btopenworld.com [81.138.1.83]) by smtp2.wavenetuk.net (Postfix) with ESMTPA id 8BAE26001D2 for ; Sat, 21 Sep 2019 20:51:11 +0100 (BST) From: Iain Sandoe Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: [Darwin, committed] Update machopic_legitimize_pic_address. Message-Id: <167C9481-B68F-47EB-94C3-49CF5DCB781C@sandoe.co.uk> Date: Sat, 21 Sep 2019 20:51:09 +0100 To: GCC Patches Some changes were missed here in the transition to LRA. The Darwin archs are all using LRA now. tested on i686-darwin9, x86_64-darwin16, applied to mainline thanks Iain gcc/ChangeLog: 2019-09-21 Iain Sandoe * config/darwin.c (machopic_legitimize_pic_address): Check for lra not reload. diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index e1017befaf..3e4bbffc92 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -842,7 +842,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) { if (reg == 0) { - gcc_assert (!reload_in_progress); + gcc_assert (!lra_in_progress); reg = gen_reg_rtx (Pmode); } @@ -926,7 +926,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) emit_use (gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM)); #endif - if (reload_in_progress) + if (lra_in_progress) df_set_regs_ever_live (REGNO (pic), true); pic_ref = gen_rtx_PLUS (Pmode, pic, machopic_gen_offset (XEXP (orig, 0))); @@ -950,7 +950,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) if (reg == 0) { - gcc_assert (!reload_in_progress); + gcc_assert (!lra_in_progress); reg = gen_reg_rtx (Pmode); } @@ -996,7 +996,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) #if 0 emit_use (pic_offset_table_rtx); #endif - if (reload_in_progress) + if (lra_in_progress) df_set_regs_ever_live (REGNO (pic), true); pic_ref = gen_rtx_PLUS (Pmode, pic,