From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Pedro Alves <pedro@palves.net>, Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH v2 2/4] {gdb, gdbserver}/Makefile.in: remove unnecessary intermediary variables
Date: Fri, 22 Mar 2024 22:14:53 -0400 [thread overview]
Message-ID: <20240323021648.154109-3-simon.marchi@efficios.com> (raw)
In-Reply-To: <20240323021648.154109-1-simon.marchi@efficios.com>
Remove `INTERNAL_CFLAGS_BASE` and `INTERNAL_WARN_CFLAGS`, inline their
contents in `INTERNAL_CFLAGS`. Not functional changes expected.
Change-Id: I6a09794835ca2cfd4a88a3e9f2e627c8f5bd569f
---
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 bf57a9a3e62e..a5139ea75803 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 3aa7aa760eaf..45073abca493 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
--
2.44.0
next prev parent reply other threads:[~2024-03-23 2:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-23 2:14 [PATCH v2 0/4] Include early include files with `-include` Simon Marchi
2024-03-23 2:14 ` [PATCH v2 1/4] gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line Simon Marchi
2024-03-23 2:14 ` Simon Marchi [this message]
2024-03-23 2:14 ` [PATCH v2 3/4] gdb, gdbserver, gdbsupport: include early header files with `-include` Simon Marchi
2024-03-26 11:57 ` Pedro Alves
2024-03-26 14:39 ` Simon Marchi
2024-03-26 15:31 ` Pedro Alves
2024-03-26 15:49 ` Simon Marchi
2024-03-23 2:14 ` [PATCH v2 4/4] gdb, gdbserver, gdbsupport: remove includes of early headers Simon Marchi
2024-03-26 11:59 ` Pedro Alves
2024-03-26 14:58 ` Simon Marchi
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=20240323021648.154109-3-simon.marchi@efficios.com \
--to=simon.marchi@efficios.com \
--cc=gdb-patches@sourceware.org \
--cc=pedro@palves.net \
/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