From patchwork Fri Feb 8 00:35:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 1038399 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-495473-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="AFSIAmbE"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QIg4yb8U"; 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 43wbpD2VSLz9sMl for ; Fri, 8 Feb 2019 11:36:17 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=dEBZ2SD76S1dDTdDj49Tq3mJLgzzyfMj7vXiInI2zaA3bR285V mrZkzuXHhvYv2T4uLPEGFybQGdqunh2FcrmbhoNvjffa7Yx3fpq/BeRvKqDG0YZo heSPss5MfRe+Q9KmFq+uppbuq4+SjJBLuvBEo51s/PbWyG6/0iv41MIvs= 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:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=qD3u1q+BR5T4JK33y1EvpINlHfU=; b=AFSIAmbE1++JFdM1Ie/u PHEPwCDklG6eX4v9+2Jj9YppJGu8/RZXxKEiu3RMJbAwenJNm7BDMqUAmHw9Ldig rFr23Ia3Ofq8malMqV+lPeFURYMZVQ32FpLkt8lh51QyObcCHLB/F58qvQUZhavQ p3vONHMkTK4rO6wuDeqbOHU= Received: (qmail 3118 invoked by alias); 8 Feb 2019 00:36:10 -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 3052 invoked by uid 89); 8 Feb 2019 00:36:08 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=powerpc64-linux, powerpc64linux, HX-Received:524c X-HELO: mail-pf1-f182.google.com Received: from mail-pf1-f182.google.com (HELO mail-pf1-f182.google.com) (209.85.210.182) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 08 Feb 2019 00:36:06 +0000 Received: by mail-pf1-f182.google.com with SMTP id f132so820310pfa.6 for ; Thu, 07 Feb 2019 16:36:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=eJmrJfBZy8zTtxjizX4XrOWVbParO/DnwScTYWH8eGs=; b=QIg4yb8UlhZEAVUOakYucAxSttVbRss/cNceRrin9/lsmrPCc3ZWAFHKelJk/jlLRE uPDKOkn04Qchda302EqfGpNacdSFy4G7qY3vglUvUAsDoPgiu/jVyPXsd7vOLFV85osZ TNjUZQKzwaxmx9k1ed23QHpTvXuCH2i6BxmmIR0YHCvWcZQ2ptzZ4C8vbcOgXOs5B01m bf2atBUAEtj5mVHvesw+aFW3uXKjh6VlH60DybTKYAyspfP6B2M5kjFzoPuIvmfCZ56S W78M4V9HfBSnjf2peppOAaI/RC3FQ0Zt3QrFaHbud+hETUslcm0HaokACCvdaNMX4hC9 PKBA== Received: from bubble.grove.modra.org ([58.175.241.133]) by smtp.gmail.com with ESMTPSA id m198sm370838pga.10.2019.02.07.16.36.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 16:36:02 -0800 (PST) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id F39D880573; Fri, 8 Feb 2019 11:05:57 +1030 (ACDT) Date: Fri, 8 Feb 2019 11:05:57 +1030 From: Alan Modra To: gcc-patches@gcc.gnu.org Cc: Segher Boessenkool Subject: [RS6000] Don't support inline PLT for ABI_V4 bss-plt Message-ID: <20190208003557.GC5398@bubble.grove.modra.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-IsSubscribed: yes Inline PLT calls need PLT to be an array of addresses. bss-plt works differently. Bootstrap and regression test on powerpc64-linux biarch in progress. OK assuming no regressions? * config/rs6000/rs6000.c (rs6000_longcall_ref): Don't use inline plt for ABI_V4 bss-plt. (rs6000_call_sysv): Likewise. diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 711278c7422..cced90bb518 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -32819,7 +32819,8 @@ rs6000_longcall_ref (rtx call_ref, rtx arg) } if (HAVE_AS_PLTSEQ - && (DEFAULT_ABI == ABI_ELFv2 || DEFAULT_ABI == ABI_V4)) + && (DEFAULT_ABI == ABI_ELFv2 + || (DEFAULT_ABI == ABI_V4 && TARGET_SECURE_PLT))) { rtx base = const0_rtx; int regno; @@ -37981,7 +37982,7 @@ rs6000_call_sysv (rtx value, rtx func_desc, rtx tlsarg, rtx cookie) func = rs6000_longcall_ref (func_desc, tlsarg); /* If the longcall was implemented using PLT16 relocs, then r11 needs to be valid at the call for lazy linking. */ - if (HAVE_AS_PLTSEQ) + if (HAVE_AS_PLTSEQ && REGNO (func) == 11) abi_reg = func; } @@ -37994,7 +37995,7 @@ rs6000_call_sysv (rtx value, rtx func_desc, rtx tlsarg, rtx cookie) calls via LR, so move the address there. Needed to mark this insn for linker plt sequence editing too. */ func_addr = gen_rtx_REG (Pmode, CTR_REGNO); - if (HAVE_AS_PLTSEQ + if (HAVE_AS_PLTSEQ && REGNO (func) == 11 && GET_CODE (func_desc) == SYMBOL_REF) { rtvec v = gen_rtvec (3, func, func_desc, tlsarg); @@ -38051,7 +38052,7 @@ rs6000_sibcall_sysv (rtx value, rtx func_desc, rtx tlsarg, rtx cookie) func = rs6000_longcall_ref (func_desc, tlsarg); /* If the longcall was implemented using PLT16 relocs, then r11 needs to be valid at the call for lazy linking. */ - if (HAVE_AS_PLTSEQ) + if (HAVE_AS_PLTSEQ && REGNO (func) == 11) abi_reg = func; } @@ -38063,7 +38064,7 @@ rs6000_sibcall_sysv (rtx value, rtx func_desc, rtx tlsarg, rtx cookie) /* Indirect sibcalls must go via CTR. Needed to mark this insn for linker plt sequence editing too. */ func_addr = gen_rtx_REG (Pmode, CTR_REGNO); - if (HAVE_AS_PLTSEQ + if (HAVE_AS_PLTSEQ && REGNO (func) == 11 && GET_CODE (func_desc) == SYMBOL_REF) { rtvec v = gen_rtvec (3, func, func_desc, tlsarg);