public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Simon Marchi <simark@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] {gdb,gdbserver}/Makefile.in: remove unnecessary intermediary variables
Date: Wed, 27 Mar 2024 01:14:29 +0000 (GMT)	[thread overview]
Message-ID: <20240327011429.0FC5A3858439@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1d43b17eac183eee00f3168733c055bdf572731d

commit 1d43b17eac183eee00f3168733c055bdf572731d
Author: Simon Marchi <simon.marchi@efficios.com>
Date:   Tue Mar 26 15:06:44 2024 -0400

    {gdb,gdbserver}/Makefile.in: remove unnecessary intermediary variables
    
    Remove `INTERNAL_CFLAGS_BASE` and `INTERNAL_WARN_CFLAGS`, inline their
    contents in `INTERNAL_CFLAGS`.  Not functional changes expected.
    
    Change-Id: I6a09794835ca2cfd4a88a3e9f2e627c8f5bd569f
    Approved-By: Pedro Alves <pedro@palves.net>

Diff:
---
 gdb/Makefile.in       |  8 ++++----
 gdbserver/Makefile.in | 12 +++---------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index bf57a9a3e62..a5139ea7580 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -631,7 +631,7 @@ INTERNAL_CPPFLAGS = $(CPPFLAGS) @GUILE_CPPFLAGS@ @PYTHON_CPPFLAGS@ \
 	@LARGEFILE_CPPFLAGS@
 
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = \
+INTERNAL_CFLAGS = \
 	$(GLOBAL_CFLAGS) \
 	$(PROFILE_CFLAGS) \
 	$(GDB_CFLAGS) \
@@ -653,9 +653,9 @@ INTERNAL_CFLAGS_BASE = \
 	$(PTHREAD_CFLAGS) \
 	$(DEBUGINFOD_CFLAGS) \
 	$(GMPINC) \
-	$(AMD_DBGAPI_CFLAGS)
-INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS)
-INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
+	$(AMD_DBGAPI_CFLAGS) \
+	$(GDB_WARN_CFLAGS) \
+	$(GDB_WERROR_CFLAGS)
 
 # LDFLAGS is specifically reserved for setting from the command line
 # when running make.
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 3aa7aa760ea..45073abca49 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -163,19 +163,13 @@ WIN32APILIBS = @WIN32APILIBS@
 MAYBE_LIBICONV = @MAYBE_LIBICONV@
 
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = \
+INTERNAL_CFLAGS = \
 	${GLOBAL_CFLAGS} \
 	${PROFILE_CFLAGS} \
 	${INCLUDE_CFLAGS} \
 	${CPPFLAGS} \
-	$(PTHREAD_CFLAGS)
-
-INTERNAL_WARN_CFLAGS = \
-	${INTERNAL_CFLAGS_BASE} \
-	$(WARN_CFLAGS)
-
-INTERNAL_CFLAGS = \
-	${INTERNAL_WARN_CFLAGS} \
+	$(PTHREAD_CFLAGS) \
+	$(WARN_CFLAGS) \
 	$(WERROR_CFLAGS) \
 	-DGDBSERVER

                 reply	other threads:[~2024-03-27  1:14 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=20240327011429.0FC5A3858439@sourceware.org \
    --to=simark@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /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).