Commit 2fbd36df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v5.19-3' of... 

Merge tag 'kbuild-fixes-v5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - Adjust gen_compile_commands.py to the format change of *.mod files

 - Remove unused macro in scripts/Makefile.modinst

* tag 'kbuild-fixes-v5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: remove unused cmd_none in scripts/Makefile.modinst
  gen_compile_commands: handle multiple lines per .mod file
parents 2b9b31ce f5a46185

scripts/Makefile.modinst

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ modules := $(patsubst $(extmod_prefix)%, $(dst)/%$(suffix-y), $(modules)) 
__modinst: $(modules)

	@:



quiet_cmd_none =

      cmd_none = :



#

# Installation

#

scripts/clang-tools/gen_compile_commands.py

+3 −3
Original line number Diff line number Diff line
@@ -157,10 +157,10 @@ def cmdfiles_for_modorder(modorder): 
            if ext != '.ko':

                sys.exit('{}: module path must end with .ko'.format(ko))

            mod = base + '.mod'

	    # The first line of *.mod lists the objects that compose the module.

            # Read from *.mod, to get a list of objects that compose the module.

            with open(mod) as m:

                for obj in m.readline().split():

                    yield to_cmdfile(obj)

                for mod_line in m:

                    yield to_cmdfile(mod_line.rstrip())





def process_line(root_directory, command_prefix, file_path):