From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 0FC5A3858439; Wed, 27 Mar 2024 01:14:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0FC5A3858439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1711502069; bh=pc4+b9ylJwEYfJU9AvHqv2mEfdrgzHJkQ5DWafRnG6k=; h=From:To:Subject:Date:From; b=Piv2o6UU8+na5tYk1Hp4t+pLmbqeNvMqr0ESkIDKKrnMYnbdWjenl4S/H/7p4e9ym GbOkgGfNeX4bYfL5QBDnWgxB9Hl7WeLyDNIxD8YS+jM9RZt23H0mmnAXpMc7WOq0yZ C+AdGYzvjyEorJbSURnldvNKw2SoilDhr3+3Tzwk= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] {gdb,gdbserver}/Makefile.in: remove unnecessary intermediary variables X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: 2f3dfa7f90806fe1bbaeb16d22d0740a5cde69a2 X-Git-Newrev: 1d43b17eac183eee00f3168733c055bdf572731d Message-Id: <20240327011429.0FC5A3858439@sourceware.org> Date: Wed, 27 Mar 2024 01:14:29 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1d43b17eac18= 3eee00f3168733c055bdf572731d commit 1d43b17eac183eee00f3168733c055bdf572731d Author: Simon Marchi Date: Tue Mar 26 15:06:44 2024 -0400 {gdb,gdbserver}/Makefile.in: remove unnecessary intermediary variables =20 Remove `INTERNAL_CFLAGS_BASE` and `INTERNAL_WARN_CFLAGS`, inline their contents in `INTERNAL_CFLAGS`. Not functional changes expected. =20 Change-Id: I6a09794835ca2cfd4a88a3e9f2e627c8f5bd569f Approved-By: Pedro Alves 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 =3D $(CPPFLAGS) @GUILE_CPPFLAGS@ @PYT= HON_CPPFLAGS@ \ @LARGEFILE_CPPFLAGS@ =20 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. -INTERNAL_CFLAGS_BASE =3D \ +INTERNAL_CFLAGS =3D \ $(GLOBAL_CFLAGS) \ $(PROFILE_CFLAGS) \ $(GDB_CFLAGS) \ @@ -653,9 +653,9 @@ INTERNAL_CFLAGS_BASE =3D \ $(PTHREAD_CFLAGS) \ $(DEBUGINFOD_CFLAGS) \ $(GMPINC) \ - $(AMD_DBGAPI_CFLAGS) -INTERNAL_WARN_CFLAGS =3D $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS) -INTERNAL_CFLAGS =3D $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS) + $(AMD_DBGAPI_CFLAGS) \ + $(GDB_WARN_CFLAGS) \ + $(GDB_WERROR_CFLAGS) =20 # 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 =3D @WIN32APILIBS@ MAYBE_LIBICONV =3D @MAYBE_LIBICONV@ =20 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. -INTERNAL_CFLAGS_BASE =3D \ +INTERNAL_CFLAGS =3D \ ${GLOBAL_CFLAGS} \ ${PROFILE_CFLAGS} \ ${INCLUDE_CFLAGS} \ ${CPPFLAGS} \ - $(PTHREAD_CFLAGS) - -INTERNAL_WARN_CFLAGS =3D \ - ${INTERNAL_CFLAGS_BASE} \ - $(WARN_CFLAGS) - -INTERNAL_CFLAGS =3D \ - ${INTERNAL_WARN_CFLAGS} \ + $(PTHREAD_CFLAGS) \ + $(WARN_CFLAGS) \ $(WERROR_CFLAGS) \ -DGDBSERVER