From patchwork Sat Jul 27 05:36:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 1137713 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-505725-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="Gtav64Vo"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aIfWO2vy"; 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 45wZSg2M3lz9s3l for ; Sat, 27 Jul 2019 15:36:33 +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:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=IQ0DHaEtJp6aN6xt8O2nx2w1Uw38BovClvt5BKeFk1mmxWnsrq sP3W3ygw0rGG/FZMQHfwllFA0Kajwq9U9VH2/QVGf13wQLkTo267oANtNmctd2YH 3f2lTfBuJ/2+E1paqtivn9NnDePeiTlHOCrTURCgcJsmWTuOuk89GlJyM= 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=MESECaRw+CbxLM32cn7xRHdzYM8=; b=Gtav64VobYtRocevNHZe HtAEAg/bGPIAsNCsXhD/fM9P12W3XzB15lCHEE9MuM2xlbBjVPUyvOEcu/YiAhjM 7OQEY+JumG5Vjg7aJmwmQM/+B7qaKYVnQiv7GxY4gBqBh6noiZIhi8vxYncDDXrY qxt8nKRDdeXAhjkF8epfEyY= Received: (qmail 96267 invoked by alias); 27 Jul 2019 05:36:26 -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 96256 invoked by uid 89); 27 Jul 2019 05:36:26 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.9 required=5.0 tests=AWL, 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.1 spammy=H*RU:209.85.210.194, HX-Spam-Relays-External:209.85.210.194, HX-HELO:sk:mail-pf, HX-Spam-Relays-External:sk:mail-pf X-HELO: mail-pf1-f194.google.com Received: from mail-pf1-f194.google.com (HELO mail-pf1-f194.google.com) (209.85.210.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 27 Jul 2019 05:36:24 +0000 Received: by mail-pf1-f194.google.com with SMTP id c3so2328415pfa.13 for ; Fri, 26 Jul 2019 22:36:24 -0700 (PDT) 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=fZ9ieYVuw2xuyNMyUralEzwpYDb5laRd4IQfQVCmHMs=; b=aIfWO2vyHHj8gmug5IWKnczvCAZbe70ju7ccXr52bGHsoYctyzG7Up20h+tzbJ2yi8 5Tte3E25sSPuk3B8LRbG6+mjoA1hEJuAo2vfJ9Fur0KK8BiuU/YkVqAUHO82j7B0UBw0 x1nUjySAT5L3xKvg+gBeIn++MzbRoGgeEgYh7+mnJB2tNTA2ivmpAtCHdccNgUFfkswc /qc0xNdNF64DyBgYnsRkbLjaplw45GbLkzNSk53fnmyNE+z7Q6fk9BXc8eD2Zqru9Awn LT3uz8IRv9JO5c1HRlWuQrynMaQKsPLhG/amV0kuxLC55kKOK5Gt3OPuryKjsiyPq2aQ Rs1g== Received: from bubble.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id i74sm102078249pje.16.2019.07.26.22.36.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 26 Jul 2019 22:36:22 -0700 (PDT) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id 748AC804CC; Sat, 27 Jul 2019 15:06:18 +0930 (ACST) Date: Sat, 27 Jul 2019 15:06:18 +0930 From: Alan Modra To: gcc-patches@gcc.gnu.org Cc: Segher Boessenkool Subject: [RS6000] PR91135, __linux__ not defined with -mcall-aixdesc on 9.x and ppc64 Message-ID: <20190727053618.GQ3379@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 makes the obvious fix for PR91135, and deletes extraneous copies of GNU_USER_TARGET_D_OS_VERSIONS that appear in rs6000/linux.h and rs6000/linux64.h. Since all configurations using either of these files also inclue linux.h there is no need to duplicate the macro. Bootstrapped and regression tested powerpc64le-linux. OK for mainline and backporting? PR target/91135 * config/rs6000/linux.h (GNU_USER_TARGET_D_OS_VERSIONS): Don't define. * config/rs6000/linux64.h (TARGET_OS_CPP_BUILTINS): Invoke GNU_USER_TARGET_OS_CPP_BUILTINS for aixdesc abi. (GNU_USER_TARGET_D_OS_VERSIONS): Don't define. diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h index 96b97877989..ffceb32bf65 100644 --- a/gcc/config/rs6000/linux.h +++ b/gcc/config/rs6000/linux.h @@ -59,19 +59,6 @@ } \ while (0) -#define GNU_USER_TARGET_D_OS_VERSIONS() \ - do { \ - builtin_version ("linux"); \ - if (OPTION_GLIBC) \ - builtin_version ("CRuntime_Glibc"); \ - else if (OPTION_UCLIBC) \ - builtin_version ("CRuntime_UClibc"); \ - else if (OPTION_BIONIC) \ - builtin_version ("CRuntime_Bionic"); \ - else if (OPTION_MUSL) \ - builtin_version ("CRuntime_Musl"); \ - } while (0) - #undef CPP_OS_DEFAULT_SPEC #define CPP_OS_DEFAULT_SPEC "%(cpp_os_linux)" diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h index ba5f640efc8..4d329b544ad 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -372,7 +372,8 @@ extern int dot_symbols; #define TARGET_OS_CPP_BUILTINS() \ do \ { \ - if (strcmp (rs6000_abi_name, "linux") == 0) \ + if (strcmp (rs6000_abi_name, "linux") == 0 \ + || strcmp (rs6000_abi_name, "aixdesc") == 0) \ GNU_USER_TARGET_OS_CPP_BUILTINS(); \ if (TARGET_64BIT) \ { \ @@ -396,19 +397,6 @@ extern int dot_symbols; } \ while (0) -#define GNU_USER_TARGET_D_OS_VERSIONS() \ - do { \ - builtin_version ("linux"); \ - if (OPTION_GLIBC) \ - builtin_version ("CRuntime_Glibc"); \ - else if (OPTION_UCLIBC) \ - builtin_version ("CRuntime_UClibc"); \ - else if (OPTION_BIONIC) \ - builtin_version ("CRuntime_Bionic"); \ - else if (OPTION_MUSL) \ - builtin_version ("CRuntime_Musl"); \ - } while (0) - #undef CPP_OS_DEFAULT_SPEC #define CPP_OS_DEFAULT_SPEC "%(cpp_os_linux) %(include_extra)"