Re: [PATCH] kbuild: dummy-tools: Add support for -fpatchable-function-entry

[Michal Suchánek]

On Tue, Oct 31, 2023 at 03:08:53PM +0900, Masahiro Yamada wrote:
> On Mon, Oct 30, 2023 at 5:32 PM Michal Suchanek <msuchanek@xxxxxxx> wrote:
> >
> > dummy-gcc does not produce the output
> > gcc-check-fpatchable-function-entry.sh expects. Add a base64 encoded
> > output of the second test.
> >
> > Fixes: 0f71dcfb4aef ("powerpc/ftrace: Add support for -fpatchable-function-entry")
> > Signed-off-by: Michal Suchanek <msuchanek@xxxxxxx>
> > ---
> 
> 
> 
> I prefer this one
> https://lore.kernel.org/linux-kbuild/20231030113416.5208-1-jirislaby@xxxxxxxxxx/T/#u
> 
> 
> Does it work for you?

Yes, that also works.

Thanks

Michal

> 
> 
> 
> 
> 
> >  scripts/dummy-tools/gcc | 19 +++++++++++++++++++
> >  1 file changed, 19 insertions(+)
> >
> > diff --git a/scripts/dummy-tools/gcc b/scripts/dummy-tools/gcc
> > index 07f6dc4c5cf6..8ab81a905cc2 100755
> > --- a/scripts/dummy-tools/gcc
> > +++ b/scripts/dummy-tools/gcc
> > @@ -73,6 +73,25 @@ if arg_contain -Wa,--version "$@"; then
> >         exit 0
> >  fi
> >
> > +if arg_contain -fpatchable-function-entry=2 "$@"; then
> > +       base64 -d <<-EOF
> > +       CS5maWxlCSI8c3RkaW4+IgoJLm1hY2hpbmUgcG93ZXI4CgkuYWJpdmVyc2lvbiAyCgkuc2VjdGlv
> > +       bgkiLnRleHQiCgkuYWxpZ24gMgoJLnAyYWxpZ24gNCwsMTUKCS5nbG9ibCBmdW5jCgkudHlwZQlm
> > +       dW5jLCBAZnVuY3Rpb24KZnVuYzoKLkxGQjA6CgkuY2ZpX3N0YXJ0cHJvYwouTENGMDoKMDoJYWRk
> > +       aXMgMiwxMiwuVE9DLi0uTENGMEBoYQoJYWRkaSAyLDIsLlRPQy4tLkxDRjBAbAoJLmxvY2FsZW50
> > +       cnkJZnVuYywuLWZ1bmMKCS5zZWN0aW9uCV9fcGF0Y2hhYmxlX2Z1bmN0aW9uX2VudHJpZXMsImF3
> > +       byIsQHByb2diaXRzLC5MUEZFMAoJLmFsaWduIDMKCS44Ynl0ZQkuTFBGRTAKCS5zZWN0aW9uCSIu
> > +       dGV4dCIKLkxQRkUwOgoJbm9wCglub3AKCWFkZGlzIDksMiwuTEFOQ0hPUjBAdG9jQGhhCglsd2Eg
> > +       MywuTEFOQ0hPUjBAdG9jQGwoOSkKCWJscgoJLmxvbmcgMAoJLmJ5dGUgMCwwLDAsMCwwLDAsMCww
> > +       CgkuY2ZpX2VuZHByb2MKLkxGRTA6Cgkuc2l6ZQlmdW5jLC4tZnVuYwoJLmdsb2JsIHgKCS5zZWN0
> > +       aW9uCSIuYnNzIgoJLmFsaWduIDIKCS5zZXQJLkxBTkNIT1IwLC4gKyAwCgkudHlwZQl4LCBAb2Jq
> > +       ZWN0Cgkuc2l6ZQl4LCA0Cng6CgkuemVybwk0CgkuaWRlbnQJIkdDQzogKFNVU0UgTGludXgpIDEz
> > +       LjIuMSAyMDIzMDkxMiBbcmV2aXNpb24gYjk2ZTY2ZmQ0ZWYzZTM2OTgzOTY5ZmI4Y2RkMTk1NmY1
> > +       NTFhMDc0Yl0iCgkuc2VjdGlvbgkubm90ZS5HTlUtc3RhY2ssIiIsQHByb2diaXRzCg==
> > +       EOF
> > +       exit 0
> > +fi
> > +
> >  if arg_contain -S "$@"; then
> >         # For scripts/gcc-x86-*-has-stack-protector.sh
> >         if arg_contain -fstack-protector "$@"; then
> > --
> > 2.42.0
> >
> 
> 
> -- 
> Best Regards
> Masahiro Yamada