Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- make fixdep parse kconfig.h to fix missing rebuild
- replace hyphens with underscores in builtin DTB label names
- fix typos
* tag 'kbuild-fixes-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: Handle builtin dtb file names containing hyphens
scripts/bloat-o-meter: fix typos in help
fixdep: do not ignore kconfig.h
fixdep: remove some false CONFIG_ matches
fixdep: remove stale references to uml-config.h
+10
-15
+4
-4
scripts/Makefile.lib
+4
-4
scripts/Makefile.lib
···
297
297
echo '\#include <asm-generic/vmlinux.lds.h>'; \
298
298
echo '.section .dtb.init.rodata,"a"'; \
299
299
echo '.balign STRUCT_ALIGNMENT'; \
300
-
echo '.global __dtb_$(*F)_begin'; \
301
-
echo '__dtb_$(*F)_begin:'; \
300
+
echo '.global __dtb_$(subst -,_,$(*F))_begin'; \
301
+
echo '__dtb_$(subst -,_,$(*F))_begin:'; \
302
302
echo '.incbin "$<" '; \
303
-
echo '__dtb_$(*F)_end:'; \
304
-
echo '.global __dtb_$(*F)_end'; \
303
+
echo '__dtb_$(subst -,_,$(*F))_end:'; \
304
+
echo '.global __dtb_$(subst -,_,$(*F))_end'; \
305
305
echo '.balign STRUCT_ALIGNMENT'; \
306
306
) > $@
307
307
+5
-10
scripts/basic/fixdep.c
+5
-10
scripts/basic/fixdep.c
···
93
93
* (Note: it'd be easy to port over the complete mkdep state machine,
94
94
* but I don't think the added complexity is worth it)
95
95
*/
96
-
/*
97
-
* Note 2: if somebody writes HELLO_CONFIG_BOOM in a file, it will depend onto
98
-
* CONFIG_BOOM. This could seem a bug (not too hard to fix), but please do not
99
-
* fix it! Some UserModeLinux files (look at arch/um/) call CONFIG_BOOM as
100
-
* UML_CONFIG_BOOM, to avoid conflicts with /usr/include/linux/autoconf.h,
101
-
* through arch/um/include/uml-config.h; this fixdep "bug" makes sure that
102
-
* those files will have correct dependencies.
103
-
*/
104
96
105
97
#include <sys/types.h>
106
98
#include <sys/stat.h>
···
225
233
static void parse_config_file(const char *p)
226
234
{
227
235
const char *q, *r;
236
+
const char *start = p;
228
237
229
238
while ((p = strstr(p, "CONFIG_"))) {
239
+
if (p > start && (isalnum(p[-1]) || p[-1] == '_')) {
240
+
p += 7;
241
+
continue;
242
+
}
230
243
p += 7;
231
244
q = p;
232
245
while (*q && (isalnum(*q) || *q == '_'))
···
283
286
{
284
287
return str_ends_with(s, len, "include/generated/autoconf.h") ||
285
288
str_ends_with(s, len, "include/generated/autoksyms.h") ||
286
-
str_ends_with(s, len, "arch/um/include/uml-config.h") ||
287
-
str_ends_with(s, len, "include/linux/kconfig.h") ||
288
289
str_ends_with(s, len, ".ver");
289
290
}
290
291
+1
-1
scripts/bloat-o-meter
+1
-1
scripts/bloat-o-meter
···
15
15
if len(sys.argv) < 3:
16
16
sys.stderr.write("usage: %s [option] file1 file2\n" % sys.argv[0])
17
17
sys.stderr.write("The options are:\n")
18
-
sys.stderr.write("-c cateogrize output based on symbole type\n")
18
+
sys.stderr.write("-c categorize output based on symbol type\n")
19
19
sys.stderr.write("-d Show delta of Data Section\n")
20
20
sys.stderr.write("-t Show delta of text Section\n")
21
21
sys.exit(-1)