From patchwork Fri Apr 3 23:37:19 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Monnerat X-Patchwork-Id: 132675 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 6B6EA4BA23C3 for ; Fri, 3 Apr 2026 23:38:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6B6EA4BA23C3 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=monnerat.net header.i=@monnerat.net header.a=rsa-sha256 header.s=mnet header.b=X7qC4GDk X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from jupiter.monnerat.net (jupiter.monnerat.net [46.226.111.226]) by sourceware.org (Postfix) with ESMTPS id E26134BA2E36 for ; Fri, 3 Apr 2026 23:37:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E26134BA2E36 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=monnerat.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=monnerat.net ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E26134BA2E36 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=46.226.111.226 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1775259457; cv=none; b=PeGAh3whr+Klmarp5qbQeFcK0ZwjO2ZPREbx8pQIjkmPzYijzNS5UtM9ucNmLlJ1Lfn2JhVod9Ebv9QHnzoXvoGrU9wC2SMCS9GkVbBKSd5PnTgZqSD4cnpI4XEie/4oJ1ktXRvSpfYYXl/1B5fdRcbphmmYxwng6T+ylzmuYhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1775259457; c=relaxed/simple; bh=8HCyJAlKYOQqolvjFqxctoWBPFOZSI0TMD8XXWGeL20=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=eo2/dYumaELq26jLZuqyBV2dyYcPW+OCEPlYwT2wCZ4NfVjDJvfBeq+F5GLHVdcS2nigi/MgqEmpTM/Lh3KlEd0cJ039c56m6sTss+RVuMZQFFtY2Pq6PA69cTzY+59Uh8xIrDGHnNRpYGQCwRsqSeLsnnoS59ug3VUAHgmjN/A= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E26134BA2E36 Received: from patrick.monnerat ([192.168.0.128]) by jupiter.monnerat.net (8.14.8/8.14.8) with ESMTP id 633NbTtE023340 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 4 Apr 2026 01:37:35 +0200 DKIM-Filter: OpenDKIM Filter v2.10.3 jupiter.monnerat.net 633NbTtE023340 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=monnerat.net; s=mnet; t=1775259455; bh=8HCyJAlKYOQqolvjFqxctoWBPFOZSI0TMD8XXWGeL20=; h=From:To:Cc:Subject:Date:From; b=X7qC4GDkfcv/av54MmtmiD7n4RFsJooLbMzxTyD3mp3VMFLodt1d+aqW0Ybbg2QIO 9Ng+nkg7T1RrjOPqXtKCuX+Lugn+EATYHVaj0qshiNIvsZ0yLr2fFJoCd//F7yP97l vjQLH7nJ8UDJQqv2W5bsWp3eRIaMKcQmLNkOZ0c8= From: Patrick Monnerat To: gdb-patches@sourceware.org Cc: Patrick Monnerat Subject: [PATCH] gdb: store gdbtk object files into their sources directory Date: Sat, 4 Apr 2026 01:37:19 +0200 Message-ID: <20260403233719.273466-1-patrick@monnerat.net> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, JMQ_SPF_NEUTRAL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on 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 Do not list gdbtk required object file names, but generates them from source file names. Use gdb object file list rather than static library for linking insight. --- gdb/Makefile.in | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 2488d789580..0198f891f9b 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -558,29 +558,19 @@ GDBTK_LIBRARY = $(datadir)/insight$(GDBTK_VERSION) # the testsuite won't run properly. GDBTK_SRC_DIR = @GDBTK_SRC_DIR@ -SUBDIR_GDBTK_OBS = \ - gdbtk.o \ - gdbtk-bp.o \ - gdbtk-cmds.o \ - gdbtk-hooks.o \ - gdbtk-interp.o \ - gdbtk-register.o \ - gdbtk-stack.o \ - gdbtk-varobj.o \ - gdbtk-wrapper.o - SUBDIR_GDBTK_SRCS = \ gdbtk/generic/gdbtk.c \ gdbtk/generic/gdbtk-bp.c \ gdbtk/generic/gdbtk-cmds.c \ gdbtk/generic/gdbtk-hooks.c \ gdbtk/generic/gdbtk-interp.c \ - gdbtk/generic/gdbtk-main.c \ gdbtk/generic/gdbtk-register.c \ gdbtk/generic/gdbtk-stack.c \ gdbtk/generic/gdbtk-varobj.c \ gdbtk/generic/gdbtk-wrapper.c +SUBDIR_GDBTK_OBS = $(patsubst %.c,%.o,$(SUBDIR_GDBTK_SRCS)) + SUBDIR_GDBTK_DEPS = $(LIBGUI) $(TCL_DEPS) $(TK_DEPS) SUBDIR_GDBTK_LDFLAGS = SUBDIR_GDBTK_CFLAGS= -DGDBTK -D@TCL_PLATFORM_DEFINE@ -D@TK_PLATFORM_DEFINE@ @@ -598,7 +588,7 @@ HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ HAVE_GSTACK = @HAVE_GSTACK@ CONFIG_SRC_SUBDIR = arch cli dwarf2 mi compile tui unittests guile python \ - target nat + target nat gdbtk/generic CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. @@ -2109,10 +2099,8 @@ $(CONFIG_DEP_SUBDIR): # Python files need special flags. python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS) -# Rules for compiling .c files in the various source subdirectories. -%.o: $(srcdir)/gdbtk/generic/%.c - $(COMPILE) $(all_gdbtk_cflags) $< - $(POSTCOMPILE) +# Insight UI needs special flags. +gdbtk/generic/%.o: INTERNAL_CFLAGS += $(all_gdbtk_cflags) installcheck: @@ -2342,6 +2330,7 @@ uninstall: force $(CONFIG_UNINSTALL) # computing the list of source files from the list of object files. INIT_FILES_FILTER_OUT = \ + gdbres.o \ init.o \ version.o \ xml-builtin.o \ @@ -2823,10 +2812,10 @@ clean-gdbtk: rm -f insight$(EXEEXT) # Removing the old gdb first works better if it is running, at least on SunOS. -insight$(EXEEXT): gdbtk-main.o libgdb.a $(CDEPS) $(TDEPLIBS) - rm -f insight$(EXEEXT) +insight$(EXEEXT): gdbtk/generic/gdbtk-main.o $(LIBGDB_OBS) $(CDEPS) $(TDEPLIBS) + $(SILENCE) rm -f insight$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ - -o insight$(EXEEXT) gdbtk-main.o libgdb.a \ + -o insight$(EXEEXT) gdbtk/generic/gdbtk-main.o $(LIBGDB_OBS) \ $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES) gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico @@ -2861,7 +2850,7 @@ endif # A list of all the objects we might care about in this build, for # dependency tracking. -all_object_files = gdb.o $(LIBGDB_OBS) gdbtk-main.o +all_object_files = gdb.o $(LIBGDB_OBS) gdbtk/generic/gdbtk-main.o # All the .deps files to include. all_deps_files = $(foreach dep,$(patsubst %.o,%.Po,$(all_object_files)),\