From patchwork Fri Sep 10 07:19:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1526401 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=EQY879Tv; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H5S1l1FL6z9sW8 for ; Fri, 10 Sep 2021 17:19:53 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 048F7385841F for ; Fri, 10 Sep 2021 07:19:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 048F7385841F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1631258391; bh=kZ/EmPFwGeSEbG0r9PyHmU45UJe0hsuCu2drAgsxo4k=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=EQY879TvYLZ3vNDGV4cV4CTf27aj4px2HPu4NgtGbgWqBpbQXYKo4bJU7df1Xtcem 8rdn6ttC16vnU0edw//3LgCww6EzQvB02OvA80o0FJF5IvGeavfNukDpj+z05GIZVc RIrJeQrL4bP7yRKonyaAbgDW34Shg1XsD9h4GVVo= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 8FDEA3858D39 for ; Fri, 10 Sep 2021 07:19:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8FDEA3858D39 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 0647F223AF; Fri, 10 Sep 2021 07:19:30 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id E0FE413D1D; Fri, 10 Sep 2021 07:19:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EvmaNQEHO2HqLwAAMHmgww (envelope-from ); Fri, 10 Sep 2021 07:19:29 +0000 Date: Fri, 10 Sep 2021 09:19:29 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Remove DARWIN_PREFER_DWARF and dead code Message-ID: <56ros87-62r2-rsr0-8p73-56r6265q6261@fhfr.qr> MIME-Version: 1.0 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Cc: iain@sandoe.co.uk Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" This removes the always defined DARWIN_PREFER_DWARF and the code guarded by it being not defined, removing the possibility to default some i386 darwin configurations to STABS when it would not be defined. OK for trunk? Thanks, Richard. 2021-09-10 Richard Biener * config/darwin.h (DARWIN_PREFER_DWARF): Do not define. * config/i386/darwin.h (PREFERRED_DEBUGGING_TYPE): Do not change based on DARWIN_PREFER_DWARF not being defined. --- gcc/config/darwin.h | 3 +-- gcc/config/i386/darwin.h | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index f1d92f87e9a..6396586c138 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -499,9 +499,8 @@ extern GTY(()) int darwin_ms_struct; /* We now require C++11 to bootstrap and newer tools than those based on stabs, so require DWARF-2, even if stabs is supported by the assembler. */ -#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG -#define DARWIN_PREFER_DWARF #define DWARF2_DEBUGGING_INFO 1 +#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG #ifdef HAVE_AS_STABS_DIRECTIVE #define DBX_DEBUGGING_INFO 1 diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h index da0ae5b3ee7..c4a6f4dfda7 100644 --- a/gcc/config/i386/darwin.h +++ b/gcc/config/i386/darwin.h @@ -264,17 +264,6 @@ along with GCC; see the file COPYING3. If not see target_flags &= ~MASK_MACHO_DYNAMIC_NO_PIC; \ } while (0) -/* Darwin on x86_64 uses dwarf-2 by default. Pre-darwin9 32-bit - compiles default to stabs+. darwin9+ defaults to dwarf-2. */ -#ifndef DARWIN_PREFER_DWARF -#undef PREFERRED_DEBUGGING_TYPE -#ifdef HAVE_AS_STABS_DIRECTIVE -#define PREFERRED_DEBUGGING_TYPE (TARGET_64BIT ? DWARF2_DEBUG : DBX_DEBUG) -#else -#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG -#endif -#endif - /* Darwin uses the standard DWARF register numbers but the default register numbers for STABS. Fortunately for 64-bit code the default and the standard are the same. */