diff options
author | Nicholas Piggin <npiggin@gmail.com> | 2018-02-10 09:25:04 -0500 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-25 13:01:19 -0400 |
commit | f49821ee32b76b1a356fab17316eb62430182ecf (patch) | |
tree | 289c979dcb971c009d3c858851af50a55be8a3e4 /Makefile | |
parent | 6358d6e8b9846c2ff6fd1d4ad2809145635dd813 (diff) |
kbuild: rename built-in.o to built-in.a
Incremental linking is gone, so rename built-in.o to built-in.a, which
is the usual extension for archive files.
This patch does two things, first is a simple search/replace:
git grep -l 'built-in\.o' | xargs sed -i 's/built-in\.o/built-in\.a/g'
The second is to invert nesting of nested text manipulations to avoid
filtering built-in.a out from libs-y2:
-libs-y2 := $(filter-out %.a, $(patsubst %/, %/built-in.a, $(libs-y)))
+libs-y2 := $(patsubst %/, %/built-in.a, $(filter-out %.a, $(libs-y)))
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -35,7 +35,7 @@ unexport GREP_OPTIONS | |||
35 | # Most importantly: sub-Makefiles should only ever modify files in | 35 | # Most importantly: sub-Makefiles should only ever modify files in |
36 | # their own directory. If in some directory we have a dependency on | 36 | # their own directory. If in some directory we have a dependency on |
37 | # a file in another dir (which doesn't happen often, but it's often | 37 | # a file in another dir (which doesn't happen often, but it's often |
38 | # unavoidable when linking the built-in.o targets which finally | 38 | # unavoidable when linking the built-in.a targets which finally |
39 | # turn into vmlinux), we will call a sub make in that other dir, and | 39 | # turn into vmlinux), we will call a sub make in that other dir, and |
40 | # after that we are sure that everything which is in that other dir | 40 | # after that we are sure that everything which is in that other dir |
41 | # is now up to date. | 41 | # is now up to date. |
@@ -982,13 +982,13 @@ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ | |||
982 | vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \ | 982 | vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \ |
983 | $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-)))) | 983 | $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-)))) |
984 | 984 | ||
985 | init-y := $(patsubst %/, %/built-in.o, $(init-y)) | 985 | init-y := $(patsubst %/, %/built-in.a, $(init-y)) |
986 | core-y := $(patsubst %/, %/built-in.o, $(core-y)) | 986 | core-y := $(patsubst %/, %/built-in.a, $(core-y)) |
987 | drivers-y := $(patsubst %/, %/built-in.o, $(drivers-y)) | 987 | drivers-y := $(patsubst %/, %/built-in.a, $(drivers-y)) |
988 | net-y := $(patsubst %/, %/built-in.o, $(net-y)) | 988 | net-y := $(patsubst %/, %/built-in.a, $(net-y)) |
989 | libs-y1 := $(patsubst %/, %/lib.a, $(libs-y)) | 989 | libs-y1 := $(patsubst %/, %/lib.a, $(libs-y)) |
990 | libs-y2 := $(filter-out %.a, $(patsubst %/, %/built-in.o, $(libs-y))) | 990 | libs-y2 := $(patsubst %/, %/built-in.a, $(filter-out %.a, $(libs-y))) |
991 | virt-y := $(patsubst %/, %/built-in.o, $(virt-y)) | 991 | virt-y := $(patsubst %/, %/built-in.a, $(virt-y)) |
992 | 992 | ||
993 | # Externally visible symbols (used by link-vmlinux.sh) | 993 | # Externally visible symbols (used by link-vmlinux.sh) |
994 | export KBUILD_VMLINUX_INIT := $(head-y) $(init-y) | 994 | export KBUILD_VMLINUX_INIT := $(head-y) $(init-y) |