From patchwork Fri Mar 2 20:20:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 26164 Received: (qmail 38363 invoked by alias); 2 Mar 2018 20:21:53 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 38338 invoked by uid 89); 2 Mar 2018 20:21:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=precious, progresses, pot X-HELO: sessmg23.ericsson.net Received: from sessmg23.ericsson.net (HELO sessmg23.ericsson.net) (193.180.251.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 02 Mar 2018 20:21:47 +0000 Received: from ESESSHC011.ericsson.se (Unknown_Domain [153.88.183.51]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id 65.D4.21824.852B99A5; Fri, 2 Mar 2018 21:21:44 +0100 (CET) Received: from ESESSMB501.ericsson.se (153.88.183.162) by ESESSHC011.ericsson.se (153.88.183.51) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 2 Mar 2018 21:20:50 +0100 Received: from ESESSMB503.ericsson.se (153.88.183.164) by ESESSMB501.ericsson.se (153.88.183.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26; Fri, 2 Mar 2018 21:20:49 +0100 Received: from NAM03-BY2-obe.outbound.protection.outlook.com (153.88.183.157) by ESESSMB503.ericsson.se (153.88.183.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26 via Frontend Transport; Fri, 2 Mar 2018 21:20:49 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by DM5PR1501MB2008.namprd15.prod.outlook.com (2603:10b6:4:a1::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Fri, 2 Mar 2018 20:20:47 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Add silent Makefile rules Date: Fri, 2 Mar 2018 15:20:36 -0500 Message-ID: <1520022036-28308-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: BN6PR18CA0022.namprd18.prod.outlook.com (2603:10b6:404:121::32) To DM5PR1501MB2008.namprd15.prod.outlook.com (2603:10b6:4:a1::38) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8cc79180-3317-4687-3f7f-08d5807b159d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:DM5PR1501MB2008; X-Microsoft-Exchange-Diagnostics: 1; DM5PR1501MB2008; 3:laru8vYElNaLOgB5C5lUjfV1ssmSciowJ3UJXpswC1jdbspG4AxSOSB8h8pXgayXhGITX4uabpRPlkmPPbf7VQ+o6JzLwxS+571KPnSLy2gRAFEIkQZgtEl6QJp0SYu5wTh5+HnhQQNXQbTeTAHqhkWp2XjTQxz4+WzTSy8k43HEUx6Aw9TFZ2+mN97XJVq88tQifYiNlPOgeH8HbKbFO5YptK9wm+alm+2xFymHsnuyDhtFkFfG5GIX8iYZ1dnM; 25:2Qk5SXb1NlmfjWErutDxYNNqKNYLFF9+ox6v9mojfDHCyhwnCBLJkbaV7qduBzGcc9EpjWsL6ERDdhptZhQVv60/g8yuryq6Y1e/fF28z7F0NBPI2JTSaSa+1xNvXUtSvxgYVBu2i4Y2k8wsM3lEzdYq73gXwlGyh64hqTRJrvuEKDEhrAhgmrUdQKA/VHNW0ZINF+0oNM3LGssmkZHz+CMYD43EfzpKU7nreKLiZ2qk1pXJYw3wBl/nZjVWIYAX9o7Oni0GQCEh57fmnUb7EySW8FEBOlsAmaQDX9+Jvzgs//j/dRdKZe1JLDRrYwkwYTIbFRwzNu8526chIozXjQ==; 31:luDNjpOGmvWLVNFJDmWJEaF0kgBm6xnQEyCSQnUvSGhIL+qXLdZMwu7+6ACQBYKELyPswatSt68bW3X67/ORQd2dplNm/4xy/+SNGwS7aUs0veQBbT+5HZ1QraEwbiC2Ye+r1Y/gcfLnytDz6nTavrzapjB5XRKGTJ4zmyyB/IuG2ibnmNeoNmGHYmFvSlFanP/uF8WRdj2N7s9h+iNv31OC1dxo8YAktei/KWrIjK4= X-MS-TrafficTypeDiagnostic: DM5PR1501MB2008: X-Microsoft-Exchange-Diagnostics: 1; DM5PR1501MB2008; 20:frVy2+LeZxbXjp9KAWPByR7/OuXS5IcrCdIbdKNxqUAsPE68iY0e4kbZslTUz0Fifbxa6iyr3FeG8ItpCxmo1ZhCF2IsoD/+RBuwZSPkGbd8v5PqukGJ3fiaIWYk2DD/ubXPaibu2bUQnFBCWFZm3h0pouDUMLCILl54elJlu9ztYv43iem3kqSrrGMzVkwUWiJ2Th3xlRnkL8nXRSf0dzc7YxM6Gpo4b7ZBxFLo6z+mZo43poFs5GUA9RYmfKW6PABvqUxY2fpH41WzncNRRGYx8ji7PrJFHtpBBwHKGw9UqrZjnoXg6imHcqumuhNwn88et8ed7t7xK4DKwlm4Tf74zgHhnC0mLqAx+hXKnAWvpaCCDg2oQ48+eD9AZWLIzj2KiTk+SqdSSFUm7OM5EUL9bWQ0B6S2RquDdgdH82JQZ0LJCGDahg0p+RgLUq8jvzwl76NhxsHT89p4wmzSGwCWX+riP1Ra2IAN3gLOVEhdNh6HZ8uemHYde12zE9AR; 4:M4YlQex8V1ZVmmiHEJpb8UiEt2EWQuNdtIO/+0v/hghOZKhhDz1mZXt3uXMgV0xZVQ6LnBhXWCvqu6WHr34sjY2gGSwCKuAkH9zRpjqoOTFbE8JXE+BJ6oAf6X7AH6uEbG4jD6rqvkOwkC/I5ZS0522kGBovFIgv3+AZrofRwCD4cppvJkeyf5kXqHz+Uc++oNV4F7fFu6Jpci0u25uTcrli3ZF1Y6vXcjq/Nz8lu7OrsJCUxF9TGm+w+ZPvKO1l9IIM5crwShHqJwt/MfBlVcj17A5EldsqFUG3mkF2eGp6PaAefn+oEBk8LCrV7qbapWSvfZI7ot1vtdlISIkPP+LpWJ7OBlh9gNmE4bcs2zZYIt10AduGdU51RJ+c+60+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(6302227615730)(155532106045638)(5213294742642); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(3231220)(944501236)(93006095)(93001095)(10201501046)(3002001)(6041288)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR1501MB2008; BCL:0; PCL:0; RULEID:; SRVR:DM5PR1501MB2008; X-Forefront-PRVS: 05991796DF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(376002)(366004)(396003)(39380400002)(54534003)(189003)(199004)(52116002)(6486002)(51416003)(8676002)(81156014)(68736007)(6916009)(316002)(2361001)(106356001)(1857600001)(36756003)(16526019)(2351001)(4326008)(2906002)(25786009)(81166006)(5660300001)(305945005)(186003)(26005)(7736002)(386003)(48376002)(50466002)(59450400001)(478600001)(105586002)(53936002)(8936002)(66066001)(16586007)(86362001)(47776003)(6116002)(50226002)(97736004)(6666003)(6506007)(3846002)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR1501MB2008; H:elxacz23q12.ca.am.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR1501MB2008; 23:9orEWZeLANEOv/XO6inr6Nhh/FBdVXArnjuQJuu?= =?us-ascii?Q?Bmdyf8GkKwUGNjvSWma4ICjp6FziVoC+ck+jGFqdZaTb9b1rdtEpQ2M2UGF9?= =?us-ascii?Q?dOtS1aDDXlFF5yf1tWnM1vkvs5ML0tJNsY5vzedhteT9zb30q0csTIER4i3u?= =?us-ascii?Q?05DlWGb1S7sHuGDcop4SJOLbb6W1rIEQR/iEWldpF8r8ZlK3o0mwkJhZh3gA?= =?us-ascii?Q?cQ5mqu6GE8zVwVu3Dg8TnM6syzp7l6Nu9i0AWIZ2IxXsqzTnNkGlduExucgN?= =?us-ascii?Q?VniDMUoBHs2gAXHTqePVw4JRi5ou5oD4or3HEFpEO73g+tfvNHIom4KM6m+V?= =?us-ascii?Q?+/pSPkhE37MMZSqtjMR+EtTsQfldKno3mYStK4KlJeZrCtP3QZtS1J5tUILQ?= =?us-ascii?Q?0aSB55pIobs3/dzorIn8q58z2yWB3i60qQ44TiG2XZW1tSNbVAcC7NFyv80Z?= =?us-ascii?Q?0YUjc6hSUTgwIjbjUUntPVLnOStOKTfopzpICWNqnVuNoM403+pQwPMdkObD?= =?us-ascii?Q?yunxDGEXzsL14c06SJeYKcj3EGGLyv2Bv5AwSteldEoAnrYJAsABpBHh2gm8?= =?us-ascii?Q?ITE5IS5kqFhzF0WHsddRXii+Q8L/jyKbfYrSUf28ls4OCehgT62HuJvkUZN4?= =?us-ascii?Q?YpoYb6fdxVhfLhSZmDNdIOwjBXIqpyGr3oqrTZ64OR89vgkjEsPTsJpfq17W?= =?us-ascii?Q?uqP4JQVK4r6j32PEiGKK09IAezc/nU9EYFdM/5n4P/XMZ8WJPGZCEbZYhZdx?= =?us-ascii?Q?ic0rF2RBH+5RGR/5NstFeqKsnkBcEK5zJEAt/qbSjRL2SbITkQE6LLdyXYH0?= =?us-ascii?Q?G1XPa3Fiyl5D1uE1OaUejsmO90KJ/7sqWPLdDnNDu8HaQPQq3mZgKgIuaip+?= =?us-ascii?Q?mPE6YJpXWEeTVJTmYBr0g4jK4Ufc1iwAyiZovTWUL4T5J7d8XLm5fBH8ABGE?= =?us-ascii?Q?Ryq92RY41BtywxsgSFUvBb+iYFCF7+8Tulno8FTbGootekWvkpDgIDoQCStw?= =?us-ascii?Q?xPSYZm3sXhz5AevXf44TEPwwpDfMaxJRRe3YeITqKk5Dc/7MuIoU3ACdIW4w?= =?us-ascii?Q?F6qaoUp2eEUnk8TbrlGjP77pH5+DEkoci3EComw1jzdae5+ym0ueXmvWjitf?= =?us-ascii?Q?rw0DXORtP7FWChT9yvbV91JHhskWckr8A0X+qcoimN8+iscLrSFf+XA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR1501MB2008; 6:gUdfcW39JxTAUxUzbHxXSU8f+QTpddlS3K/44PcEKcfmaK1t3poJvfqBR+ty99ov6WMSvBLICTKXCnM12vCCdfDg+oq86S7FgSHo7M+e1YgQ0MUqjHpg0fjMmSVVU1lmn/UqLHQUZpQS0IKV2CfSGnScmEKvoRp8vdaSJWNf6PIHVLJ8ESpOkaHIkgZz1nhUqlSPZCmAMoYi2ENKdrEjoNXM7H1P2p7SvIOkavUxhu6tB9fnEIu3Dpd2agMf3h1xcDySPms3x9RunfFnTQBEEqQosQVc4Jzwib1yijUT7mX9hOtmrEjCoQDkzjTSn3eVGZVBHLLn49y3FH1yMYrgNapPrJ1pArRpLrQbgCK7oqY=; 5:ocC1eQ2YYqjFDN3QAW03apb1NlwIcbcxnJrVszkmK9qu/EKnvcJtKsH5/K+OFUKbihdJGi3ySETK8+Mw42620i4CUcRcmIf+JCrWYfeKsDZ8kDzBIQR7RiCgH4cHbdHkGzw8xdYMRFghrAe6lUDC7JZhUJJf7tiAYILsh0mIfj4=; 24:6DuTufqnCVdDepsEhQWrRstnm8ni86J/YgXkMg7lrH5PHW+HMBwEWXMrw12xYOLomw2xmyLCGD/LHKSiJISza4m5FpNc/WCYfWXcxuI85cs=; 7:m6kDvaWHp+7tzMhuAFG0Oj4h2Ngc6MXkup5FYHO19DTYmvHL7WJXgWCP2sPfc/vCYj2xc+983mMfa8kbBSYy7fW4s+Dn5U+k8O1fULTMH7UerV3LB78UIQ28GNmc8xov+a2BHi6GxGujhxnuxmPnTbl3nS7RrSc2o4RwN9VeflfGknHEoRxjLEdtQnAy3Q+xhyB5at5yca23+DGoG/MRFCTgAr8eAZNNNby8xV5K4DmfGXpUsc5fy7bnlhzVsZPX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2018 20:20:47.2252 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8cc79180-3317-4687-3f7f-08d5807b159d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1501MB2008 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes From: Simon Marchi Many projects (e.g. the Linux kernel) and build systems use "silent" rules, which means that they'll only print a summary of what's being done instead of printing all the detailed command lines. While chatting on the #gdb IRC channel, I realized a few people (including me) thought it would be nice to have it in GDB too. The idea is that too much text is not useful, the important information gets lost. If there's only the essential information, it's more likely to be useful. Most of the time, when I look at the build output, it's to see how it's progressing. By just printing a brief summary of each operation, I can easily spot what's currently being compiled and therefore how the build progresses (with time you know the order in which files are compiled almost by heart). As with other projects (Linux, automake-based things, probably others), it's possible to print the complete command lines by passing V=1 to make (or any other non-zero value). I had one hesitation about this: when people report build failures, we are more likely to miss the full compile command line. We'll probably sometimes need to ask people to include the build log with "make V=1". I don't think it's a big downside, if other projects the size of the Linux kernel can live with it, I'm sure we can too. gdb/ChangeLog: * silent-rules.mk: New. * Makefile.in: Include silent-rules.mk (srcdir, VPATH, top_srcdir): Move up. (COMPILE): Add ECHO_CC. (test-cp-name-parser$(EXEEXT)): Add ECHO_LD. (init.c): Add ECHO_INIT_C. (gdb$(EXEEXT)): Add SILENCE and ECHO_LD. (version.c): Add ECHO_GEN. (printcmd.o): Add ECHO_CC. (target-float.o): Add ECHO_CC. (ada-exp.o): Add ECHO_CC. (stamp-xml): Add SILENCE and ECHO_GEN_XML_BUILTIN. (insight$(EXEEXT)): Add ECHO_LD. gdb/testsuite/ChangeLog: * Makefile.in: Include silent-rules.mk. (srcdir, abs_top_srcdir, abs_srcdir, VPATH): Move up. (COMPILE): Add ECHO_CC. (gdbserver$(EXEEXT)): Add SILENCE and ECHO_LD. (gdbreplay$(EXEEXT)): Add SILENCE and ECHO_LD. ($(IPA_LIB)): Add SILENCE and ECHO_LD. (version-generated.c): Add ECHO_GEN. (stamp-xml): Add SILENCE and ECHO_GEN_XML_BUILTIN_GENERATED. (IPAGENT_COMPILE): Add ECHO_CC. (%-generated.c): Add ECHO_REGDAT. --- gdb/Makefile.in | 48 ++++++++++++++++++++----------------- gdb/gdbserver/Makefile.in | 60 ++++++++++++++++++++++++++--------------------- gdb/silent-rules.mk | 14 +++++++++++ 3 files changed, 73 insertions(+), 49 deletions(-) create mode 100644 gdb/silent-rules.mk diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 19be64f..c7cf1db 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -112,18 +112,20 @@ DEPMODE = @CCDEPMODE@ DEPDIR = @DEPDIR@ depcomp = $(SHELL) $(srcdir)/../depcomp +# Directory containing source files. +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + +include $(srcdir)/silent-rules.mk + # Note that these are overridden by GNU make-specific code below if # GNU make is used. The overrides implement dependency tracking. COMPILE.pre = $(CXX) -x c++ $(CXX_DIALECT) COMPILE.post = -c -o $@ -COMPILE = $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post) +COMPILE = $(ECHO_CC) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post) POSTCOMPILE = @true -# Directory containing source files. -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - YACC = @YACC@ # This is used to rebuild ada-lex.c from ada-lex.l. If the program is @@ -1794,7 +1796,7 @@ test-cp-name-parser.o: cp-name-parser.c $(POSTCOMPILE) test-cp-name-parser$(EXEEXT): test-cp-name-parser.o $(LIBIBERTY) - $(CC_LD) $(INTERNAL_LDFLAGS) -o test-cp-name-parser$(EXEEXT) \ + $(ECHO_LD) $(CC_LD) $(INTERNAL_LDFLAGS) -o test-cp-name-parser$(EXEEXT) \ test-cp-name-parser.o $(LIBIBERTY) # We do this by grepping through sources. If that turns out to be too slow, @@ -1836,7 +1838,7 @@ test-cp-name-parser$(EXEEXT): test-cp-name-parser.o $(LIBIBERTY) INIT_FILES = $(COMMON_OBS) $(TSOBS) $(CONFIG_SRCS) $(SUBDIR_GCC_COMPILE_SRCS) init.c: $(INIT_FILES) - @echo Making init.c + @$(ECHO_INIT_C) echo "Making init.c" @rm -f init.c-tmp init.l-tmp @touch init.c-tmp @echo gdbtypes > init.l-tmp @@ -1896,8 +1898,8 @@ libgdb.a: $(LIBGDB_OBS) # Removing the old gdb first works better if it is running, at least on SunOS. gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS) - rm -f gdb$(EXEEXT) - $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ + $(SILENCE) rm -f gdb$(EXEEXT) + $(ECHO_LD) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ -o gdb$(EXEEXT) gdb.o $(LIBGDB_OBS) \ $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES) @@ -2128,7 +2130,7 @@ $(srcdir)/copying.c: @MAINTAINER_MODE_TRUE@ $(srcdir)/../COPYING3 $(srcdir)/copy mv $(srcdir)/copying.tmp $(srcdir)/copying.c version.c: Makefile version.in $(srcdir)/../bfd/version.h $(srcdir)/common/create-version.sh - $(SHELL) $(srcdir)/common/create-version.sh $(srcdir) \ + $(ECHO_GEN) $(SHELL) $(srcdir)/common/create-version.sh $(srcdir) \ $(host_alias) $(target_alias) version.c observer.h: observer.sh doc/observer.texi @@ -2373,14 +2375,16 @@ ALLDEPFILES = \ # Do not try to build "printcmd.c" with -Wformat-nonliteral. It manually # checks format strings. printcmd.o: $(srcdir)/printcmd.c - $(COMPILE.pre) $(INTERNAL_CFLAGS) $(GDB_WARN_CFLAGS_NO_FORMAT) \ - $(COMPILE.post) $(srcdir)/printcmd.c + $(ECHO_CC) $(COMPILE.pre) $(INTERNAL_CFLAGS) \ + $(GDB_WARN_CFLAGS_NO_FORMAT) $(COMPILE.post) \ + $(srcdir)/printcmd.c $(POSTCOMPILE) # Same for "target-float.c". target-float.o: $(srcdir)/target-float.c - $(COMPILE.pre) $(INTERNAL_CFLAGS) $(GDB_WARN_CFLAGS_NO_FORMAT) \ - $(COMPILE.post) $(srcdir)/target-float.c + $(ECHO_CC) $(COMPILE.pre) $(INTERNAL_CFLAGS) \ + $(GDB_WARN_CFLAGS_NO_FORMAT) $(COMPILE.post) \ + $(srcdir)/target-float.c # ada-exp.c can appear in srcdir, for releases; or in ., for # development builds. @@ -2389,8 +2393,8 @@ ADA_EXP_C = `if test -f ada-exp.c; then echo ada-exp.c; else echo $(srcdir)/ada- # Some versions of flex give output that triggers # -Wold-style-definition. ada-exp.o: ada-exp.c - $(COMPILE.pre) $(INTERNAL_CFLAGS) $(GDB_WARN_CFLAGS_NO_DEFS) \ - $(COMPILE.post) $(ADA_EXP_C) + $(ECHO_CC) $(COMPILE.pre) $(INTERNAL_CFLAGS) \ + $(GDB_WARN_CFLAGS_NO_DEFS) $(COMPILE.post) $(ADA_EXP_C) $(POSTCOMPILE) # Message files. Based on code in gcc/Makefile.in. @@ -2521,12 +2525,12 @@ po/$(PACKAGE).pot: force xml-builtin.c: stamp-xml; @true stamp-xml: $(srcdir)/features/feature_to_c.sh Makefile $(XMLFILES) - rm -f xml-builtin.tmp - AWK="$(AWK)" \ + $(SILENCE) rm -f xml-builtin.tmp + $(ECHO_GEN_XML_BUILTIN) AWK="$(AWK)" \ $(SHELL) $(srcdir)/features/feature_to_c.sh \ xml-builtin.tmp $(XMLFILES) - $(SHELL) $(srcdir)/../move-if-change xml-builtin.tmp xml-builtin.c - echo stamp > stamp-xml + $(SILENCE) $(SHELL) $(srcdir)/../move-if-change xml-builtin.tmp xml-builtin.c + $(SILENCE) echo stamp > stamp-xml .PRECIOUS: xml-builtin.c @@ -2584,7 +2588,7 @@ clean-gdbtk: insight$(EXEEXT): gdbtk-main.o libgdb.a $(ADD_DEPS) \ $(CDEPS) $(TDEPLIBS) rm -f insight$(EXEEXT) - $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ + $(ECHO_LD) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ -o insight$(EXEEXT) gdbtk-main.o libgdb.a \ $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index f293692..0cb6b9b 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -64,13 +64,6 @@ DEPMODE = @CCDEPMODE@ DEPDIR = @DEPDIR@ depcomp = $(SHELL) $(srcdir)/../depcomp -# Note that these are overridden by GNU make-specific code below if -# GNU make is used. The overrides implement dependency tracking. -COMPILE.pre = $(CXX) -x c++ $(CXX_DIALECT) -COMPILE.post = -c -o $@ -COMPILE = $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post) -POSTCOMPILE = @true - # Directory containing source files. Don't clean up the spacing, # this exact string is matched for by the "configure" script. srcdir = @srcdir@ @@ -78,6 +71,15 @@ abs_top_srcdir = @abs_top_srcdir@ abs_srcdir = @abs_srcdir@ VPATH = @srcdir@ +include $(srcdir)/../silent-rules.mk + +# Note that these are overridden by GNU make-specific code below if +# GNU make is used. The overrides implement dependency tracking. +COMPILE.pre = $(CXX) -x c++ $(CXX_DIALECT) +COMPILE.post = -c -o $@ +COMPILE = $(ECHO_CC) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post) +POSTCOMPILE = @true + # It is also possible that you will need to add -I/usr/include/sys to the # CFLAGS section if your system doesn't have fcntl.h in /usr/include (which # is where it should be according to Posix). @@ -378,9 +380,10 @@ clean-info: force @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU) $(LIBIBERTY) - rm -f gdbserver$(EXEEXT) - $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbserver$(EXEEXT) $(OBS) \ - $(LIBGNU) $(LIBIBERTY) $(GDBSERVER_LIBS) $(XM_CLIBS) + $(SILENCE) rm -f gdbserver$(EXEEXT) + $(ECHO_LD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + -o gdbserver$(EXEEXT) $(OBS) $(LIBGNU) $(LIBIBERTY) \ + $(GDBSERVER_LIBS) $(XM_CLIBS) $(LIBGNU) $(LIBIBERTY) $(GNULIB_H): all-lib all-lib: $(GNULIB_BUILDDIR)/Makefile $(LIBIBERTY_BUILDDIR)/Makefile @@ -388,9 +391,10 @@ all-lib: $(GNULIB_BUILDDIR)/Makefile $(LIBIBERTY_BUILDDIR)/Makefile .PHONY: all-lib gdbreplay$(EXEEXT): $(GDBREPLAY_OBS) $(LIBGNU) $(LIBIBERTY) - rm -f gdbreplay$(EXEEXT) - $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) \ - $(XM_CLIBS) $(LIBGNU) $(LIBIBERTY) + $(SILENCE) rm -f gdbreplay$(EXEEXT) + $(ECHO_LD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) $(XM_CLIBS) $(LIBGNU) \ + $(LIBIBERTY) IPA_OBJS = \ ax-ipa.o \ @@ -410,9 +414,10 @@ IPA_OBJS = \ IPA_LIB = libinproctrace.so $(IPA_LIB): $(IPA_OBJS) ${ADD_DEPS} ${CDEPS} - rm -f $(IPA_LIB) - $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) -Wl,--no-undefined $(INTERNAL_CFLAGS) \ - $(INTERNAL_LDFLAGS) -o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread + $(SILENCE) rm -f $(IPA_LIB) + $(ECHO_LD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \ + -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + -o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread # Put the proper machine-specific files first, so M-. on a machine # specific routine gets the one for the correct machine. @@ -494,15 +499,16 @@ am--refresh: force: version-generated.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../common/create-version.sh - $(SHELL) $(srcdir)/../common/create-version.sh $(srcdir)/.. \ - $(host_alias) $(target_alias) $@ + $(ECHO_GEN) $(SHELL) $(srcdir)/../common/create-version.sh $(srcdir)/.. \ + $(host_alias) $(target_alias) $@ xml-builtin-generated.c: stamp-xml; @true stamp-xml: $(XML_DIR)/feature_to_c.sh Makefile $(XML_FILES) - rm -f xml-builtin.tmp - $(SHELL) $(XML_DIR)/feature_to_c.sh xml-builtin.tmp $(XML_FILES) - $(SHELL) $(srcdir)/../../move-if-change xml-builtin.tmp xml-builtin-generated.c - echo stamp > stamp-xml + $(SILENCE) rm -f xml-builtin.tmp + $(ECHO_GEN_XML_BUILTIN_GENERATED) $(SHELL) $(XML_DIR)/feature_to_c.sh \ + xml-builtin.tmp $(XML_FILES) + $(SILENCE) $(SHELL) $(srcdir)/../../move-if-change xml-builtin.tmp xml-builtin-generated.c + $(SILENCE) echo stamp > stamp-xml .PRECIOUS: xml-builtin.c @@ -527,7 +533,7 @@ IPAGENT_CFLAGS = $(INTERNAL_CFLAGS) $(UST_CFLAGS) \ -fPIC -DIN_PROCESS_AGENT \ -fvisibility=hidden -IPAGENT_COMPILE = $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post) +IPAGENT_COMPILE = $(ECHO_CC) $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post) # Rules for special cases. @@ -598,16 +604,16 @@ common/%.o: ../common/%.c # -generated to identify and clean them easily. %-generated.c: ../regformats/%.dat | $(regdat_sh) - $(SHELL) $(regdat_sh) $< $@ + $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ %-generated.c: ../regformats/arm/%.dat | $(regdat_sh) - $(SHELL) $(regdat_sh) $< $@ + $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ %-generated.c: ../regformats/i386/%.dat | $(regdat_sh) - $(SHELL) $(regdat_sh) $< $@ + $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ %-generated.c: ../regformats/rs6000/%.dat | $(regdat_sh) - $(SHELL) $(regdat_sh) $< $@ + $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ # # Dependency tracking. diff --git a/gdb/silent-rules.mk b/gdb/silent-rules.mk new file mode 100644 index 0000000..d2715ad --- /dev/null +++ b/gdb/silent-rules.mk @@ -0,0 +1,14 @@ +# If V is undefined or V=0 is specified, use the silent/verbose/compact mode. +V ?= 0 +ifeq ($(V),0) +ECHO_CC = @echo " CC $@"; +ECHO_LD = @echo " LD $@"; +ECHO_REGDAT = @echo " REGDAT $@"; +ECHO_GEN = @echo " GEN $@"; +ECHO_GEN_XML_BUILTIN = \ + @echo " GEN xml-builtin.c"; +ECHO_GEN_XML_BUILTIN_GENERATED = \ + @echo " GEN xml-builtin-generated.c"; +ECHO_INIT_C = echo " GEN init.c" || +SILENCE = @ +endif