From patchwork Sun Feb 18 09:18:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Pettersson X-Patchwork-Id: 85935 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 304F83861802 for ; Sun, 18 Feb 2024 09:19:51 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by sourceware.org (Postfix) with ESMTPS id AB2C0385B509 for ; Sun, 18 Feb 2024 09:19:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AB2C0385B509 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AB2C0385B509 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708247966; cv=none; b=msSDhe1tJHM6Pp1tbC8Q115X3gDgGVddSpZ5omCx+lRihba/hmvbb2g9q+UGwPUM2GWBN2cDSnP4FtWuQEinWOAf0OMNUbsttBDw4PKewfWlFa9dW4k2K2GPnXuHvq4iqK5fLyliZ7od1Kq58HphUHMKs/IrPq2GLWZZnPjoT2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708247966; c=relaxed/simple; bh=ddO8aqFOuIBHBBBMi4PHD2IgkeqJYuVPYnwhkLcsIpc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=a/PkktoEvI2tDNyzYputyRtSnSDEB9fW7dcB6gIggeqz7AeIrdMK5SqTuQBmJnNl1NtbDQolbEOjcrrmUNfgvUboIx1nNqAiSIgnP3If8/jH0mGcgXkgJqCes0iWp/NBrkJdRqHlv2JUL/WCExTXArAk1ORixS9NDM1QnHAzX/s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-5128812662eso2942297e87.0 for ; Sun, 18 Feb 2024 01:19:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708247963; x=1708852763; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8zi2D/fJabcbCh1MF+JwYttjjxD3YnUSVnaj2mdE2UY=; b=NLM5FEpDHPpLzuQfiiR6rFwH7hZf23HzqlBjykKyYtVMTFXgOAz04d9X/HAiyYAfPe g3x5l49YtMk5eJhjxol3aCcYYygAhN1gLOtCUIDic+Dw+cDK7RUEE1fMOHEPUnKpXiGl Tz8F8lDU9amHfT9fWopMTO00QR8gpDqYCHDNrHlKu7vFo0QfNZuZLQkVg5E69Vc0zXju Zq0y19hRzzA9nDrw18x1gieSB619cQPPVpshh65Meqrrkh7J3ZB11Sag5sxyWm0odvy2 I39zYwl/gThrCkWcabTcFna9sOyxOEEc+TriGsFqJAqeikzotYrqQVwmP0J1RJgjCb4L ihNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708247963; x=1708852763; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8zi2D/fJabcbCh1MF+JwYttjjxD3YnUSVnaj2mdE2UY=; b=XkB49vzQKT7UysdKIMb9Rg1KuSMzhFlQTKLWMZnZcYyQrabdZ/5haCxFYZW+tEh+bM 6pNF2y7O96x1G7Pkz7jmmj2yGj8522EJmPHJXLlfM1ciPCQ0+6prpbaV9N4jW2mJfNzz zhdpubQfpeZV4d3arFOe04Nb96d7jMnDOpuvbkWk5TOEFmHcSjHThKJlvxq/PNX54Ihh eRYSocUfKUdO6XOMCI3wMe77f0Yhcm8jnhNX7mPe2dQXe48B7+3W4bl91MBuSS7HflAb Mji2FcM6j+Fwl3TjrLb/hmNbFMiTbirSFmaVqfW7eToR4q/NF0BdxI7KxMQCzOwYlXZI /WDg== X-Gm-Message-State: AOJu0Yy8eITl/8LUbxty32wArKkW27iCXHB/vYcihMuzsYLvJGNokcKw 6mXaE5TX5PUPX/+AZNgzhB03MCeletYvo7IobRfj3J3rLdKnh0dwwfMMcDXX X-Google-Smtp-Source: AGHT+IEDpOsBRdR4vA1wCuXHdZT08WJJ1oBiLzfPuIxgN6VUVZXE06dvrXg/8oyYutvSiRAqtMFEgg== X-Received: by 2002:ac2:47f3:0:b0:511:5569:680d with SMTP id b19-20020ac247f3000000b005115569680dmr6064539lfp.22.1708247962708; Sun, 18 Feb 2024 01:19:22 -0800 (PST) Received: from hallertau.. (ip006.net-192-176-117.koping.net. [192.176.117.6]) by smtp.gmail.com with ESMTPSA id a13-20020a19ca0d000000b005128da4818dsm516429lfg.197.2024.02.18.01.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 01:19:22 -0800 (PST) From: Mikael Pettersson To: gcc-patches@gcc.gnu.org Cc: Mikael Pettersson Subject: [PATCH] m68k: restore bootstrap Date: Sun, 18 Feb 2024 10:18:55 +0100 Message-ID: <20240218091911.3077-1-mikpelinux@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org m68k fails to bootstrap since -ffold-mem-offsets was introduced, in what looks like wrong-code during stage2. To restore bootstrap this disables -ffold-mem-offsets on m68k. It's not ideal, but better than keeping bootstraps broken until the root cause is debugged and fixed. Tested with a bootstrap and regression test run on m68k-linux-gnu. Ok for master? (I'll need help getting it committed.) gcc/ PR target/113357 * config/m68k/m68k.cc (m68k_option_override): Disable -ffold-mem-offsets. Fix typo in comment. --- gcc/config/m68k/m68k.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/config/m68k/m68k.cc b/gcc/config/m68k/m68k.cc index b1c9238949f..700f8151286 100644 --- a/gcc/config/m68k/m68k.cc +++ b/gcc/config/m68k/m68k.cc @@ -587,7 +587,7 @@ m68k_option_override (void) : (m68k_cpu_flags & FL_COLDFIRE) != 0 ? FPUTYPE_COLDFIRE : FPUTYPE_68881); - /* Sanity check to ensure that msep-data and mid-sahred-library are not + /* Sanity check to ensure that msep-data and mid-shared-library are not * both specified together. Doing so simply doesn't make sense. */ if (TARGET_SEP_DATA && TARGET_ID_SHARED_LIBRARY) @@ -716,6 +716,9 @@ m68k_option_override (void) else m68k_sched_mac = MAC_NO; } + + /* -ffold-mem-offsets doesn't work for m68k (PR113357). */ + flag_fold_mem_offsets = 0; } /* Implement TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE. */