From patchwork Fri Dec 7 10:30:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 1009320 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-491864-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="gmSjr2z9"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XDx2C1no"; 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 43B7zN0sZRz9s7T for ; Fri, 7 Dec 2018 21:30:55 +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=gzb9i1388BqWs/cxDw/lyAN/PRtlVjHCPIb2mRrB+FNqBOwUOC ex7txSW1tGStVLpQhiG1ydzpMU9FaZhAmW/InunRGk/k4ere0IXWDa2AbOWb6X3r LvDPPjBX+eNYlaMnLL4NHX3IIKavt7ZAWpZvm/8ri63fspc5+dQuVm/Dg= 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=PS8PV5DdPmmcP7rU/KYmXNXvQJM=; b=gmSjr2z9/IECMmwG5dIT FLGd8BcCDEl6UIbyD2MYD2AvI3plKokdqzWrLrSvzWqz3FR9TGTCN+W0zQ+aI5Uy xau0FHAkmEIf/IsYSSL1ESc/AfOndMNx2NFuEKvyugXFtNHmjA3q5pZ/27qwPgVy jG+MR/4yU5LpZ3qCeqwhL3M= Received: (qmail 104137 invoked by alias); 7 Dec 2018 10:30:48 -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 103793 invoked by uid 89); 7 Dec 2018 10:30:48 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=4497, hitting, HX-HELO:sk:mail-pg, H*RU:sk:mail-pg X-HELO: mail-pg1-f169.google.com Received: from mail-pg1-f169.google.com (HELO mail-pg1-f169.google.com) (209.85.215.169) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 07 Dec 2018 10:30:45 +0000 Received: by mail-pg1-f169.google.com with SMTP id t13so1535870pgr.11 for ; Fri, 07 Dec 2018 02:30:45 -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=gcZXNpz53/ida1OKAZhmQvXlFnZqZmSX5ehAa9hGlt8=; b=XDx2C1noaiELsDOw+8f7LgEgV86FEglJ4Rt6uQAcPP92zDfzP8CO06z8C9y2UquXuz T4LKaxgAPGhV3s50jXa+XP2xc5zpFLANk6DOIacHSTnzRuIx4wAyPfLn0HkI1PYlCi9F 89ACv/EZiw4NBiMNqYKGSBEcaXglqZa715LI8p3ZI/5NB4Hb3OEYYy1hrVgta22Hr8nv M8N0OrR1MpszIuate2T8yPgr/UJasnkoxkBtpK8HYZwDPumt4t6wLHF2rKRcwHfeLLWX Lz3fTjqczMQ5vzwxQQuabUH11kji9DVXyyT8PPBLvb+NoAekGAnyP/Wa3FLtuloKibvW 4o0A== Received: from bubble.grove.modra.org ([58.175.241.133]) by smtp.gmail.com with ESMTPSA id 15sm4393848pfr.55.2018.12.07.02.30.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Dec 2018 02:30:43 -0800 (PST) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id 8598280533; Fri, 7 Dec 2018 21:00:39 +1030 (ACDT) Date: Fri, 7 Dec 2018 21:00:39 +1030 From: Alan Modra To: gcc-patches@gcc.gnu.org Cc: Segher Boessenkool Subject: PR88346, Inconsistent list of CPUs supported by the rs6000 backend after r266502 Message-ID: <20181207103039.GH29034@bubble.grove.modra.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-IsSubscribed: yes This patch removes the %e error for AIX, since it seems there has been no attempt to keep ASM_CPU_SPEC cpu support up to date for AIX, and adds missing entries to ASM_CPU_SPEC in rs6000.h. Removing the %e isn't ideal, but leaving it in and hitting a compiler error for -mcpu cases where the AIX assembler works fine with default options, is worse. The rs64a->rs64 name change happened a long time ago as a fix for PR20813 (git commit c92b4c3f5b). Bootstrapped and regression tested powerpc64le-linux. OK? PR 88346 * config/rs6000/rs6000.h (ASM_CPU_SPEC): Correct %e message. Handle -mcpu=rs64, not -mcpu=rs64a. Handle -mcpu=powerpc64 and -mcpu=titan. * config/rs6000/driver-rs6000.c (asm_names): Similarly. * config/rs6000/aix71.h (ASM_CPU_SPEC): Delete %e message. Handle -mcpu=rs64, not -mcpu=rs64a. * config/rs6000/aix72.h (ASM_CPU_SPEC): Likewise. diff --git a/gcc/config/rs6000/aix71.h b/gcc/config/rs6000/aix71.h index 2398ed64baa..d2fbba4f509 100644 --- a/gcc/config/rs6000/aix71.h +++ b/gcc/config/rs6000/aix71.h @@ -77,7 +77,7 @@ do { \ mcpu=power4: -mpwr4; \ mcpu=power3: -m620; \ mcpu=powerpc: -mppc; \ - mcpu=rs64a: -mppc; \ + mcpu=rs64: -mppc; \ mcpu=603: -m603; \ mcpu=603e: -m603; \ mcpu=604: -m604; \ @@ -88,8 +88,7 @@ do { \ !mcpu*: %{mvsx: -mpwr6; \ maltivec: -m970; \ maix64|mpowerpc64: -mppc64; \ - : %(asm_default)}; \ - :%eMissing -mcpu option in ASM_SPEC_CPU?\n} \ + : %(asm_default)}} \ -many" #undef ASM_DEFAULT_SPEC diff --git a/gcc/config/rs6000/aix72.h b/gcc/config/rs6000/aix72.h index cfb0258acce..211010748c6 100644 --- a/gcc/config/rs6000/aix72.h +++ b/gcc/config/rs6000/aix72.h @@ -77,7 +77,7 @@ do { \ mcpu=power4: -mpwr4; \ mcpu=power3: -m620; \ mcpu=powerpc: -mppc; \ - mcpu=rs64a: -mppc; \ + mcpu=rs64: -mppc; \ mcpu=603: -m603; \ mcpu=603e: -m603; \ mcpu=604: -m604; \ @@ -88,8 +88,7 @@ do { \ !mcpu*: %{mvsx: -mpwr6; \ maltivec: -m970; \ maix64|mpowerpc64: -mppc64; \ - : %(asm_default)}; \ - :%eMissing -mcpu option in ASM_SPEC_CPU?\n} \ + : %(asm_default)}} \ -many" #undef ASM_DEFAULT_SPEC diff --git a/gcc/config/rs6000/driver-rs6000.c b/gcc/config/rs6000/driver-rs6000.c index 0a48d46d658..51c6b79e741 100644 --- a/gcc/config/rs6000/driver-rs6000.c +++ b/gcc/config/rs6000/driver-rs6000.c @@ -449,7 +449,7 @@ static const struct asm_name asm_names[] = { { "power8", "-mpwr8" }, { "power9", "-mpwr9" }, { "powerpc", "-mppc" }, - { "rs64a", "-mppc" }, + { "rs64", "-mppc" }, { "603", "-m603" }, { "603e", "-m603" }, { "604", "-m604" }, @@ -477,8 +477,9 @@ static const struct asm_name asm_names[] = { { "power9", "-mpower9" }, { "a2", "-ma2" }, { "powerpc", "-mppc" }, + { "powerpc64", "-mppc64" }, { "powerpc64le", "%{mpower9-vector:-mpower9;:-mpower8}" }, - { "rs64a", "-mppc64" }, + { "rs64", "-mppc64" }, { "401", "-mppc" }, { "403", "-m403" }, { "405", "-m405" }, @@ -519,6 +520,7 @@ static const struct asm_name asm_names[] = { { "e500mc64", "-me500mc64" }, { "e5500", "-me5500" }, { "e6500", "-me6500" }, + { "titan", "-mtitan" }, { NULL, "\ %{mpower9-vector: -mpower9; \ mpower8-vector|mcrypto|mdirect-move|mhtm: -mpower8; \ diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h index 2a62679bdb8..e7e998d1492 100644 --- a/gcc/config/rs6000/rs6000.h +++ b/gcc/config/rs6000/rs6000.h @@ -87,9 +87,10 @@ mcpu=power4: -mpower4; \ mcpu=power3: -mppc64; \ mcpu=powerpc: -mppc; \ + mcpu=powerpc64: -mppc64; \ mcpu=a2: -ma2; \ mcpu=cell: -mcell; \ - mcpu=rs64a: -mppc64; \ + mcpu=rs64: -mppc64; \ mcpu=401: -mppc; \ mcpu=403: -m403; \ mcpu=405: -m405; \ @@ -130,11 +131,12 @@ mcpu=e500mc64: -me500mc64; \ mcpu=e5500: -me5500; \ mcpu=e6500: -me6500; \ + mcpu=titan: -mtitan; \ !mcpu*: %{mpower9-vector: -mpower9; \ mpower8-vector|mcrypto|mdirect-move|mhtm: -mpower8; \ mvsx: -mpower7; \ mpowerpc64: -mppc64;: %(asm_default)}; \ - :%eMissing -mcpu option in ASM_SPEC_CPU?\n} \ + :%eMissing -mcpu option in ASM_CPU_SPEC?\n} \ %{mvsx: -mvsx -maltivec; maltivec: -maltivec} \ -many"