mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Josh Poimboeuf <jpoimboe@redhat.com>
To: David Laight <David.Laight@ACULAB.COM>
Cc: 'Luis Ressel' <aranea@aixah.de>,
	Peter Zijlstra <peterz@infradead.org>,
	open list <linux-kernel@vger.kernel.org>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: [PATCH] objtool: Don't use -Werror
Date: Mon, 8 Apr 2019 08:02:35 -0500	[thread overview]
Message-ID: <20190408130235.hmpmr6dtc2prywzu@treble> (raw)
In-Reply-To: <4dcc5b4ce124408495a440511acfc4c4@AcuMS.aculab.com>

On Mon, Apr 08, 2019 at 09:20:50AM +0000, David Laight wrote:
> From: Josh Poimboeuf
> > Sent: 05 April 2019 18:23
> > On Fri, Apr 05, 2019 at 05:17:15PM +0000, David Laight wrote:
> > > > Hm, I don't see that in cmd_objtool, or any commits from you in
> > > > scripts/Makefile.build.
> > >
> > > Not sure I remember actually committing them.
> > > Maybe 'git diff' isn't doing what I expect :-)
> > > I hate git.
> > 
> > Do you see it here?
> > 
> >   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.build
> 
> No, I must have had to tell git to apply the change locally.
> I can't see how to get git to diff against the 'real' head.
> Anyway a 'random' number of ^ after HEAD gave me:
> 
> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> index e7889f4..a2f7abe 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -193,7 +193,9 @@ else
>  cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
> 
>  cmd_modversions_c =                                                            \
> -       if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then             \
> +       if ! obj_headers=$$($(OBJDUMP) -h $(@D)/.tmp_$(@F)); then               \
> +               false;                                                          \
> +       elif echo "$$obj_headers" | grep -q __ksymtab; then                     \
>                 $(call cmd_gensymtypes_c,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))  \
>                     > $(@D)/.tmp_$(@F:.o=.ver);                                 \
>                                                                                 \
> @@ -277,7 +279,14 @@ endif
>  # 'OBJECT_FILES_NON_STANDARD_foo.o := 'n': override directory skip for a file
>  cmd_objtool = $(if $(patsubst y%,, \
>         $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
> -       $(__objtool_obj) $(objtool_args) "$(objtool_o)";)
> +       $(__objtool_obj) $(objtool_args) "$(objtool_o)" && { \
> +               $(OBJDUMP) -h "$(objtool_o)" >/dev/null 2>&1 || { \
> +                       echo >&2 "******* objtool generated the invalid file $(objtool_o)"; \
> +                       echo >&2 "******* Update libelf.so or disable the ORC unwinder"; \
> +                       /bin/false; \
> +               }; \
> +       };)
> +
>  objtool_obj = $(if $(patsubst y%,, \
>         $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
>         $(__objtool_obj))
> 
> Do you want a formal patch?

Hm, I wonder if there's a way for objtool itself to detect it's
producing a bad file.  That would be a bit cleaner.

-- 
Josh

  reply	other threads:[~2019-04-08 13:02 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-05 11:01 Luis Ressel
2019-04-05 12:39 ` Josh Poimboeuf
2019-04-05 14:24   ` Luis Ressel
2019-04-05 14:39     ` Josh Poimboeuf
2019-04-05 16:05       ` Luis Ressel
2019-04-05 16:15         ` Josh Poimboeuf
2019-04-05 16:30           ` Luis Ressel
2019-04-05 16:16         ` David Laight
2019-04-05 16:21           ` Josh Poimboeuf
2019-04-05 16:35             ` David Laight
2019-04-05 17:12               ` Josh Poimboeuf
2019-04-05 17:17                 ` David Laight
2019-04-05 17:22                   ` Josh Poimboeuf
2019-04-08  9:20                     ` David Laight
2019-04-08 13:02                       ` Josh Poimboeuf [this message]
2019-04-05 16:26           ` 'Luis Ressel'
2019-04-05 16:35             ` 'Luis Ressel'

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190408130235.hmpmr6dtc2prywzu@treble \
    --to=jpoimboe@redhat.com \
    --cc=David.Laight@ACULAB.COM \
    --cc=aranea@aixah.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®