[PATCH] kbuild: fixdep: Resync this with v4.17

[Masahiro Yamada]

On Tue, Feb 18, 2020 at 8:32 PM Masahiro Yamada <masahiroy at kernel.org> wrote:
>
> Hi Tom,
>
> On Tue, Feb 18, 2020 at 11:29 AM Tom Rini <trini at konsulko.com> wrote:
> >
> > The previous kbuild resync
>
>
> Precisely, it was "kconfig resync", not "kbuild resync".
>
>
> > of e91610da7c8a ("kconfig: re-sync with Linux
> > 4.17-rc4") accidentally did not sync the fixdep program.
>
>
> I do not think it was accidental.
>
> Kconfig and fixdep are separate programs.
> You do not necessarily need to sync them together.
>
>
>
> > This commit
> > brings fixdep in line with the rest of that previous resync.
> >
> > This includes all of the following Linux kernel commits:
> > fbfa9be9904e kbuild: move include/config/ksym/* to include/ksym/*
> > 5b8ad96d1a44 fixdep: remove some false CONFIG_ matches
> > 14a596a7e6fd fixdep: remove stale references to uml-config.h
> > ab9ce9feed36 fixdep: use existing helper to check modular CONFIG options
> > 87b95a81357d fixdep: refactor parse_dep_file()
> > 5d1ef76f5a22 fixdep: move global variables to local variables of main()
> > ccfe78873c22 fixdep: remove unneeded memcpy() in parse_dep_file()
> > 4003fd80cba9 fixdep: factor out common code for reading files
> > 01b5cbe7012f fixdep: use malloc() and read() to load dep_file to buffer
> > 41f92cffba19 fixdep: remove unnecessary <arpa/inet.h> inclusion
> > 7c2ec43a2154 fixdep: exit with error code in error branches of do_config_file()
> > 4e433fc4d1a9 fixdep: trivial: typo fix and correction
> > dee81e988674 fixdep: faster CONFIG_ search
> > c1a95fda2a40 kbuild: add fine grained build dependencies for exported symbols
> > d8329e35cc08 fixdep: accept extra dependencies on stdin
> > 4c835b57b8de fixdep: constify strrcmp arguments
> >
> > Of note is that when applying dee81e988674 above our logic in that area
> > required some careful consideration to continue to apply.
>
> I checked it. The resync looks correct.
>
>
>
> > We specifically do not include:
> > 638e69cf2230 fixdep: do not ignore kconfig.h
> > as this leads to build problems for us resulting in problems like:
> > dts/.dt.dtb.o.cmd:5: *** unterminated call to function 'wildcard': missing ')'.  Stop.
>
>
> This is due to config_enabled(CONFIG_VAL(option##_MODULE))
> in include/linux/kconfig.h
>
> This line was unneeded in the first place
> since U-Boot does not support module,
> but I just wanted to make it aligned with Linux somehow.
>
>
> I sent two patches.
> Please choose either depending your workflow.
>
> [A] http://patchwork.ozlabs.org/patch/1239950/
>     (If you want to fix the issue before re-sync)
>
> [B] http://patchwork.ozlabs.org/patch/1239952/
>     (If you want to fix the issue after re-sync)
>
>
> Then, you can import
> 638e69cf2230 fixdep: do not ignore kconfig.h



BTW, I noticed another problem in fixdep.

I will hold back a fix-up
until your resync work is done.


-- 
Best Regards
Masahiro Yamada