From patchwork Thu Sep 8 15:21:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chung-Lin Tang X-Patchwork-Id: 1098 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5044:0:0:0:0:0 with SMTP id h4csp299498wrt; Thu, 8 Sep 2022 08:21:43 -0700 (PDT) X-Google-Smtp-Source: AA6agR4ytmciatEdT3rkYUxT494xPwX0eOvvZNOmMao8ADZkZT+CS6jaS2U2vot8vfDwhNmMw7it X-Received: by 2002:a17:907:60c7:b0:739:52ba:cbd0 with SMTP id hv7-20020a17090760c700b0073952bacbd0mr6482271ejc.152.1662650503094; Thu, 08 Sep 2022 08:21:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662650503; cv=none; d=google.com; s=arc-20160816; b=JTeMpjRuEXRzGUD5FI1ATcEHa4f5pbQbzD770HgPbJ0UxSTJsRNOtQb8PlfjK+uiBC YL2uc/p/z5Sp6wFFSQ0aGVswOYF8x1Mgmkom2EuD1kIi2e+58Rcd0b47QkbL2YyjYo/J r+ATs8zHw3SA7sYyuX5EikTc3kVdOuUFlahV1RKb9ZpDl3+sZcnp6Db2ip4TVyYeQKGk ADPlJOpRiPe05MJhQjcg9b7zrK2uYcjSNkT5digJxAZT9zWk7Rukzlblnhvbztcj0ZQO WHkxx78QxkEQJuMkCDAWUT93x3vmMbs8LE5ZWFzOqtbqooSb0LU5e2rmL6d/Tb1hg+OL q0ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:from:to :content-language:user-agent:mime-version:date:message-id :ironport-sdr:dmarc-filter:delivered-to; bh=jtXgeNGzTZ05028mYWE0GlkOA8/eAMMKGMqAEPOZFCM=; b=kkm/Z7Bp7LiR6pniQjBYkbwviqWLszV10pDiKGxjaGB7JVzbyljgHcC5TL3tun0/0u B34bptkDL4CmFcrkQv9/jmlxapFliXWBCVHSPm/yC1CVrgMtJ+rWfk87/Nd8Ux1lmcYO p8d5ZrsG1Zcp2lQWdB7S/usX90aFUPGcZ235gCxUboBJzk4HTVU43/M0AGlcusZtqrPB NyjhW5BsyF12Pww90X1CSI/HE8VELm8nLd9xZ04jX343x0TDwB/RgJDiYxB0xzOHkw5d IajhUKPYzsuKkjgzG5LiJ+GeALQhDggtS5hJuv7zgBlunoDrvFI5D6bXCxq4xIH0MNFn bD/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id hs24-20020a1709073e9800b0073d581b0906si2789024ejc.278.2022.09.08.08.21.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 08:21:43 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6F0BF385742A for ; Thu, 8 Sep 2022 15:21:33 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 517893858428 for ; Thu, 8 Sep 2022 15:21:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 517893858428 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.93,300,1654588800"; d="scan'208,223";a="82549924" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 08 Sep 2022 07:21:09 -0800 IronPort-SDR: b0+jmisWAKzxIwEWAqlh70772KdyyhdJH6rg8H+dCiZQDwV89nmGe6IUWMoT+OXsePhh3Ad9yP wltENpcVWM7D8/lv5Df7/U7jo054/P4y1KpYUHvRuLBO9X5d159HxrEDUutu16nb5o5S2UVwF3 E7446cC3O6LYTteA3C1Mf6n8UFYkzTJ2SL8o4tZzW8aQq7txfXt+T2K+01HMNT3HygzH++Msrk lKmVe2M2ONJ9D9mVzCP6lvZzSq7X3Uemt4rK4QeatmHkQd3QRoR3TEuadUncWhXR94Sm0fKxii 9Fc= Message-ID: <70d35b7c-43e2-9d5c-c151-761e7633c4c5@codesourcery.com> Date: Thu, 8 Sep 2022 23:21:03 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.2.1 Content-Language: en-US To: gcc-patches From: Chung-Lin Tang Subject: [PATCH, nios2, committed] Add #undef of MUSL_DYNAMIC_LINKER X-ClientProxiedBy: svr-orw-mbx-11.mgc.mentorg.com (147.34.90.211) To svr-orw-mbx-10.mgc.mentorg.com (147.34.90.210) X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sandra Loosemore Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1743415413693104969?= X-GMAIL-MSGID: =?utf-8?q?1743415413693104969?= This patch adds an #undef of MUSL_DYNAMIC_LINKER before its #define in config/nios2/linux.h. This makes the nios2-linux build pass when the compiler is configured with --enable-werror-always. Patch pushed to master at 0697bd070c4fffb33468976c93baff9493922fb3 Chung-Lin From 0697bd070c4fffb33468976c93baff9493922fb3 Mon Sep 17 00:00:00 2001 From: Chung-Lin Tang Date: Thu, 8 Sep 2022 23:14:38 +0800 Subject: [PATCH] nios2: Add #undef of MUSL_DYNAMIC_LINKER Add #undef of MUSL_DYNAMIC_LINKER before #define, to satisfy build checks when configured with --enable-werror-always. gcc/ChangeLog: * config/nios2/linux.h (MUSL_DYNAMIC_LINKER): Add #undef before #define. --- gcc/config/nios2/linux.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h index f5dd813acad..9e53dd657e4 100644 --- a/gcc/config/nios2/linux.h +++ b/gcc/config/nios2/linux.h @@ -30,6 +30,8 @@ #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1" + +#undef MUSL_DYNAMIC_LINKER #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-nios2.so.1" #undef LINK_SPEC