From patchwork Sat Mar 23 02:14:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 87550 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AFD84385828E for ; Sat, 23 Mar 2024 02:17:37 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id DD6C93858D37 for ; Sat, 23 Mar 2024 02:16:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD6C93858D37 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DD6C93858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711160216; cv=none; b=Cjp+SHL5HhqX2WVihIwBGXEmKpCCkr0PwJ5/OWe7Wp04VroEaBklg64yXMYRwL9nzWoUkNfAzm+ENviHlgsT+Z0aMAK3ceOY2PoXZhcLnjf66Wy5m6MNm58sSv78n6m31ij1+UJQ0CBtwQAj7BbL+2f5HViiD6TKv0MGOz0NOWA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711160216; c=relaxed/simple; bh=ICVaMTF/N0zpbyCzI7uniR4pSJN9Km6VmYLJdH/DpPU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=lGZ3+ysJxf+nFGw8uZ/5ibFYxqiSRp1zgkdccJcbwvPoe5jhjc3g9SHb5TKPFoza7MzkDmiCZ1u/C5iOmZlmq/ogFbm3Y1mMNUfmJhfOyZ9jlOg0Cu4BQzvaal3bg3uZmAmhx6KFo4taD9pjo24EHvtM2ZGkCgKdnSQJ0/pnjIc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 38FE01E0C0; Fri, 22 Mar 2024 22:16:51 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Pedro Alves , Simon Marchi Subject: [PATCH v2 2/4] {gdb, gdbserver}/Makefile.in: remove unnecessary intermediary variables Date: Fri, 22 Mar 2024 22:14:53 -0400 Message-ID: <20240323021648.154109-3-simon.marchi@efficios.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240323021648.154109-1-simon.marchi@efficios.com> References: <20240323021648.154109-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1173.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP, UPPERCASE_50_75 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org 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