From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id 5FB993858C27 for ; Wed, 17 Nov 2021 04:44:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5FB993858C27 Received: by mail-pf1-x432.google.com with SMTP id r130so1486678pfc.1 for ; Tue, 16 Nov 2021 20:44:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=+Y7ogCAjB8oDRBw4f23VvanfRdW4dGb9rePzumQOhF8=; b=GhUxLCn2Xnoj4sq/XApAc96yz5sYtgbocj0gKXjAdqq2vAYsx1ERCsE6IKXP/Dx1ya 3WMK2lcUlIBWzJfA+pqVxPbqZ3AYEG9npTVjZhNtiG5fEoxYLwic+3nDUQKhDDoFw2N6 zmsiD7RGOF240h4Is0y8V7hQJ7zi01ASFDCxHqsC3IFf7l7Q8Uk06PHmfCngLR0Ft6Ta m4Al8VzX0YyltJ+IeNBDUsHQgKHoOMyEYwWPT40+YOaC/9yT7rmeUe7bwDfWjAlZM4it LObXOc3qPXhbcpIA8Va8aHJ/zFbo0OyKWPyAD3VT993+TxLZUQYEjI3UQZkcahLZ26iT SxWw== X-Gm-Message-State: AOAM531OncSmK6JhQAXn3UnVNVnuhpI0wXzVvh7S3NSBFibY+i0WFBx7 32tbfJQASrI0fGyQkS7pkC02hdNhgFk= X-Google-Smtp-Source: ABdhPJwsQ2wyCNhqx/BOgav4V+UBzpe6aSyx377Nv1eQPIjc+rhRhvhljvIB4QNuZ7OfApkIpfRauA== X-Received: by 2002:a05:6a00:13a4:b0:49f:add2:3c83 with SMTP id t36-20020a056a0013a400b0049fadd23c83mr4461125pfg.28.1637124248488; Tue, 16 Nov 2021 20:44:08 -0800 (PST) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:c83:fcd5:445:742f]) by smtp.gmail.com with ESMTPSA id hk18sm3968823pjb.20.2021.11.16.20.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 20:44:07 -0800 (PST) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 9BCD11140028; Wed, 17 Nov 2021 15:14:04 +1030 (ACDT) Date: Wed, 17 Nov 2021 15:14:04 +1030 From: Alan Modra To: Simon Marchi Cc: binutils@sourceware.org Subject: Re: [PATCH] binutils: put DEBUGINFOD_CFLAGS in AM_CFLAGS Message-ID: References: <20211102183505.2322983-1-simon.marchi@efficios.com> <6cc9ade3-0b1a-3159-8cbb-c992dc657b8a@efficios.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6cc9ade3-0b1a-3159-8cbb-c992dc657b8a@efficios.com> X-Spam-Status: No, score=-3037.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Nov 2021 04:44:11 -0000 On Mon, Nov 15, 2021 at 11:08:52AM -0500, Simon Marchi via Binutils wrote: > Ping. I can't say I like it, admittedly mostly because you're putting a thing named *_CFLAGS into AM_CFLAGS. If it was only -I options and guaranteed to stay that way I'd be happier, but the potiential for someone to put other options in DEBUGINFOD_CFLAGS worries me. > > Fix this by putting DEBUGINFOD_CFLAGS in AM_CFLAGS. I think it would be > > a bit better to only include DEBUGINFOD_CFLAGS in readelf's and > > objdump's CFLAGS, but I couldn't get that to work, because of the > > special build rule for objdump.c (if somebody wants to try it, please go > > ahead). Does the following work for you? diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 7f4c24c213b..ee2a66302cd 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -46,6 +46,9 @@ am__skipyacc = ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ +DEBUGINFOD_CFLAGS = @DEBUGINFOD_CFLAGS@ +DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ + WARN_CFLAGS = @WARN_CFLAGS@ WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ NO_WERROR = @NO_WERROR@ @@ -53,8 +56,6 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC) AM_CFLAGS_FOR_BUILD = $(WARN_CFLAGS_FOR_BUILD) $(ZLIBINC) LIBICONV = @LIBICONV@ -DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ - # these two are almost the same program AR_PROG=ar RANLIB_PROG=ranlib @@ -366,6 +367,18 @@ endif $(COMPILE) -c `test -f arlex.c || echo $(srcdir)/`arlex.c $(NO_WERROR) endif +dwarf.@OBJEXT@: dwarf.c +if am__fastdepCC + $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo $(DEBUGINFOD_CFLAGS) -c -o $@ $(srcdir)/dwarf.c + mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +else +if AMDEP + source='dwarf.c' object='$@' libtool=no @AMDEPBACKSLASH@ + DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +endif + $(COMPILE) $(DEBUGINFOD_CFLAGS) -c -o $@ $(srcdir)/dwarf.c +endif + sysroff.@OBJEXT@: sysroff.c if am__fastdepCC $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f sysroff.c || echo $(srcdir)/`sysroff.c $(NO_WERROR) diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 5252ef18b5c..8f44b566725 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -1530,6 +1530,13 @@ arlex.@OBJEXT@: arlex.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f arlex.c || echo $(srcdir)/`arlex.c $(NO_WERROR) +dwarf.@OBJEXT@: dwarf.c +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo $(DEBUGINFOD_CFLAGS) -c -o $@ $(srcdir)/dwarf.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dwarf.c' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) $(DEBUGINFOD_CFLAGS) -c -o $@ $(srcdir)/dwarf.c + sysroff.@OBJEXT@: sysroff.c @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f sysroff.c || echo $(srcdir)/`sysroff.c $(NO_WERROR) @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -- Alan Modra Australia Development Lab, IBM