public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Chung-Lin Tang <cltang@codesourcery.com>
To: gcc-patches <gcc-patches@gcc.gnu.org>
Cc: Sandra Loosemore <sandra@codesourcery.com>
Subject: [PATCH, nios2, committed] Add #undef of MUSL_DYNAMIC_LINKER
Date: Thu, 8 Sep 2022 23:21:03 +0800	[thread overview]
Message-ID: <70d35b7c-43e2-9d5c-c151-761e7633c4c5@codesourcery.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

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

[-- Attachment #2: 0001-nios2-Add-undef-of-MUSL_DYNAMIC_LINKER.patch --]
[-- Type: text/plain, Size: 924 bytes --]

From 0697bd070c4fffb33468976c93baff9493922fb3 Mon Sep 17 00:00:00 2001
From: Chung-Lin Tang <cltang@codesourcery.com>
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
-- 
2.17.1


                 reply	other threads:[~2022-09-08 15:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=70d35b7c-43e2-9d5c-c151-761e7633c4c5@codesourcery.com \
    --to=cltang@codesourcery.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=sandra@codesourcery.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).