From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: iain@sandoe.co.uk Subject: [PATCH] Remove DARWIN_PREFER_DWARF and dead code Message-ID: <56ros87-62r2-rsr0-8p73-56r6265q6261@fhfr.qr> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII 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-List-Received-Date: Fri, 10 Sep 2021 07:19:33 -0000 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. */ -- 2.31.1