cosmetic: kbuild: clean-up coding style (sync with Linux 3.16-rc1)
Import the following trivial commits from Linux v3.16-rc1: bb66fc6 kbuild: trivial - use tabs for code indent where possible 7eb6e34 kbuild: trivial - remove trailing empty lines 3fbb43d kbuild: trivial - fix comment block indent 38385f8 kbuild: trivial - remove trailing spaces Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
parent
9e546ee9c9
commit
45f0ad9545
16
Makefile
16
Makefile
@ -244,18 +244,18 @@ endif
|
|||||||
KBUILD_MODULES :=
|
KBUILD_MODULES :=
|
||||||
KBUILD_BUILTIN := 1
|
KBUILD_BUILTIN := 1
|
||||||
|
|
||||||
# If we have only "make modules", don't compile built-in objects.
|
# If we have only "make modules", don't compile built-in objects.
|
||||||
# When we're building modules with modversions, we need to consider
|
# When we're building modules with modversions, we need to consider
|
||||||
# the built-in objects during the descend as well, in order to
|
# the built-in objects during the descend as well, in order to
|
||||||
# make sure the checksums are up to date before we record them.
|
# make sure the checksums are up to date before we record them.
|
||||||
|
|
||||||
ifeq ($(MAKECMDGOALS),modules)
|
ifeq ($(MAKECMDGOALS),modules)
|
||||||
KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
|
KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# If we have "make <whatever> modules", compile modules
|
# If we have "make <whatever> modules", compile modules
|
||||||
# in addition to whatever we do anyway.
|
# in addition to whatever we do anyway.
|
||||||
# Just "make" or "make all" shall build modules as well
|
# Just "make" or "make all" shall build modules as well
|
||||||
|
|
||||||
# U-Boot does not need modules
|
# U-Boot does not need modules
|
||||||
#ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)
|
#ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)
|
||||||
@ -1219,7 +1219,7 @@ CLOBBER_FILES += u-boot* MLO* SPL System.map
|
|||||||
|
|
||||||
# Directories & files removed with 'make mrproper'
|
# Directories & files removed with 'make mrproper'
|
||||||
MRPROPER_DIRS += include/config include/generated \
|
MRPROPER_DIRS += include/config include/generated \
|
||||||
.tmp_objdiff
|
.tmp_objdiff
|
||||||
MRPROPER_FILES += .config .config.old \
|
MRPROPER_FILES += .config .config.old \
|
||||||
tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
|
tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
|
||||||
include/config.h include/config.mk
|
include/config.h include/config.mk
|
||||||
|
@ -369,7 +369,7 @@ $(real-objs-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
|
|||||||
$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
|
$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
|
||||||
|
|
||||||
quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
|
quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
|
||||||
cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
|
cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
|
||||||
|
|
||||||
$(obj)/%.s: $(src)/%.S FORCE
|
$(obj)/%.s: $(src)/%.S FORCE
|
||||||
$(call if_changed_dep,as_s_S)
|
$(call if_changed_dep,as_s_S)
|
||||||
@ -463,7 +463,7 @@ link_multi_deps = \
|
|||||||
$(filter $(addprefix $(obj)/, \
|
$(filter $(addprefix $(obj)/, \
|
||||||
$($(subst $(obj)/,,$(@:.o=-objs))) \
|
$($(subst $(obj)/,,$(@:.o=-objs))) \
|
||||||
$($(subst $(obj)/,,$(@:.o=-y)))), $^)
|
$($(subst $(obj)/,,$(@:.o=-y)))), $^)
|
||||||
|
|
||||||
quiet_cmd_link_multi-y = LD $@
|
quiet_cmd_link_multi-y = LD $@
|
||||||
cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
|
cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
|
||||||
|
|
||||||
|
@ -166,5 +166,4 @@ $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
|
|||||||
$(call if_changed,host-cshlib)
|
$(call if_changed,host-cshlib)
|
||||||
|
|
||||||
targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
|
targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
|
||||||
$(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
|
$(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
|
# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
|
||||||
# and add the directory to the list of dirs to descend into: $(subdir-y)
|
# and add the directory to the list of dirs to descend into: $(subdir-y)
|
||||||
# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
|
# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
|
||||||
# and add the directory to the list of dirs to descend into: $(subdir-m)
|
# and add the directory to the list of dirs to descend into: $(subdir-m)
|
||||||
|
|
||||||
# Determine modorder.
|
# Determine modorder.
|
||||||
@ -46,7 +46,7 @@ obj-m := $(filter-out %/, $(obj-m))
|
|||||||
|
|
||||||
subdir-ym := $(sort $(subdir-y) $(subdir-m))
|
subdir-ym := $(sort $(subdir-y) $(subdir-m))
|
||||||
|
|
||||||
# if $(foo-objs) exists, foo.o is a composite object
|
# if $(foo-objs) exists, foo.o is a composite object
|
||||||
multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
|
multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
|
||||||
multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
|
multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
|
||||||
multi-used := $(multi-used-y) $(multi-used-m)
|
multi-used := $(multi-used-y) $(multi-used-m)
|
||||||
@ -91,7 +91,7 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs))
|
|||||||
|
|
||||||
# These flags are needed for modversions and compiling, so we define them here
|
# These flags are needed for modversions and compiling, so we define them here
|
||||||
# already
|
# already
|
||||||
# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
|
# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
|
||||||
# end up in (or would, if it gets compiled in)
|
# end up in (or would, if it gets compiled in)
|
||||||
# Note: Files that end up in two or more modules are compiled without the
|
# Note: Files that end up in two or more modules are compiled without the
|
||||||
# KBUILD_MODNAME definition. The reason is that any made-up name would
|
# KBUILD_MODNAME definition. The reason is that any made-up name would
|
||||||
@ -212,7 +212,7 @@ $(obj)/%: $(src)/%_shipped
|
|||||||
|
|
||||||
# Commands useful for building a boot image
|
# Commands useful for building a boot image
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
#
|
#
|
||||||
# Use as following:
|
# Use as following:
|
||||||
#
|
#
|
||||||
# target: source(s) FORCE
|
# target: source(s) FORCE
|
||||||
@ -226,7 +226,7 @@ $(obj)/%: $(src)/%_shipped
|
|||||||
|
|
||||||
quiet_cmd_ld = LD $@
|
quiet_cmd_ld = LD $@
|
||||||
cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \
|
cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \
|
||||||
$(filter-out FORCE,$^) -o $@
|
$(filter-out FORCE,$^) -o $@
|
||||||
|
|
||||||
# Objcopy
|
# Objcopy
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
@ -409,10 +409,10 @@ static void print_deps(void)
|
|||||||
exit(2);
|
exit(2);
|
||||||
}
|
}
|
||||||
if (fstat(fd, &st) < 0) {
|
if (fstat(fd, &st) < 0) {
|
||||||
fprintf(stderr, "fixdep: error fstat'ing depfile: ");
|
fprintf(stderr, "fixdep: error fstat'ing depfile: ");
|
||||||
perror(depfile);
|
perror(depfile);
|
||||||
exit(2);
|
exit(2);
|
||||||
}
|
}
|
||||||
if (st.st_size == 0) {
|
if (st.st_size == 0) {
|
||||||
fprintf(stderr,"fixdep: %s is empty\n",depfile);
|
fprintf(stderr,"fixdep: %s is empty\n",depfile);
|
||||||
close(fd);
|
close(fd);
|
||||||
|
@ -154,7 +154,7 @@ int symfilecnt = 0;
|
|||||||
static void add_new_symbol(struct symfile *sym, char * symname)
|
static void add_new_symbol(struct symfile *sym, char * symname)
|
||||||
{
|
{
|
||||||
sym->symbollist =
|
sym->symbollist =
|
||||||
realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
|
realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
|
||||||
sym->symbollist[sym->symbolcnt++].name = strdup(symname);
|
sym->symbollist[sym->symbolcnt++].name = strdup(symname);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -215,7 +215,7 @@ static void find_export_symbols(char * filename)
|
|||||||
char *p;
|
char *p;
|
||||||
char *e;
|
char *e;
|
||||||
if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) ||
|
if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) ||
|
||||||
((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
|
((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
|
||||||
/* Skip EXPORT_SYMBOL{_GPL} */
|
/* Skip EXPORT_SYMBOL{_GPL} */
|
||||||
while (isalnum(*p) || *p == '_')
|
while (isalnum(*p) || *p == '_')
|
||||||
p++;
|
p++;
|
||||||
@ -291,28 +291,28 @@ static void extfunc(char * filename) { docfunctions(filename, FUNCTION); }
|
|||||||
static void singfunc(char * filename, char * line)
|
static void singfunc(char * filename, char * line)
|
||||||
{
|
{
|
||||||
char *vec[200]; /* Enough for specific functions */
|
char *vec[200]; /* Enough for specific functions */
|
||||||
int i, idx = 0;
|
int i, idx = 0;
|
||||||
int startofsym = 1;
|
int startofsym = 1;
|
||||||
vec[idx++] = KERNELDOC;
|
vec[idx++] = KERNELDOC;
|
||||||
vec[idx++] = DOCBOOK;
|
vec[idx++] = DOCBOOK;
|
||||||
vec[idx++] = SHOWNOTFOUND;
|
vec[idx++] = SHOWNOTFOUND;
|
||||||
|
|
||||||
/* Split line up in individual parameters preceded by FUNCTION */
|
/* Split line up in individual parameters preceded by FUNCTION */
|
||||||
for (i=0; line[i]; i++) {
|
for (i=0; line[i]; i++) {
|
||||||
if (isspace(line[i])) {
|
if (isspace(line[i])) {
|
||||||
line[i] = '\0';
|
line[i] = '\0';
|
||||||
startofsym = 1;
|
startofsym = 1;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (startofsym) {
|
if (startofsym) {
|
||||||
startofsym = 0;
|
startofsym = 0;
|
||||||
vec[idx++] = FUNCTION;
|
vec[idx++] = FUNCTION;
|
||||||
vec[idx++] = &line[i];
|
vec[idx++] = &line[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (i = 0; i < idx; i++) {
|
for (i = 0; i < idx; i++) {
|
||||||
if (strcmp(vec[i], FUNCTION))
|
if (strcmp(vec[i], FUNCTION))
|
||||||
continue;
|
continue;
|
||||||
consume_symbol(vec[i + 1]);
|
consume_symbol(vec[i + 1]);
|
||||||
}
|
}
|
||||||
vec[idx++] = filename;
|
vec[idx++] = filename;
|
||||||
@ -460,14 +460,14 @@ static void parse_file(FILE *infile)
|
|||||||
break;
|
break;
|
||||||
case 'D':
|
case 'D':
|
||||||
while (*s && !isspace(*s)) s++;
|
while (*s && !isspace(*s)) s++;
|
||||||
*s = '\0';
|
*s = '\0';
|
||||||
symbolsonly(line+2);
|
symbolsonly(line+2);
|
||||||
break;
|
break;
|
||||||
case 'F':
|
case 'F':
|
||||||
/* filename */
|
/* filename */
|
||||||
while (*s && !isspace(*s)) s++;
|
while (*s && !isspace(*s)) s++;
|
||||||
*s++ = '\0';
|
*s++ = '\0';
|
||||||
/* function names */
|
/* function names */
|
||||||
while (isspace(*s))
|
while (isspace(*s))
|
||||||
s++;
|
s++;
|
||||||
singlefunctions(line +2, s);
|
singlefunctions(line +2, s);
|
||||||
@ -515,11 +515,11 @@ int main(int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
/* Open file, exit on error */
|
/* Open file, exit on error */
|
||||||
infile = fopen(argv[2], "r");
|
infile = fopen(argv[2], "r");
|
||||||
if (infile == NULL) {
|
if (infile == NULL) {
|
||||||
fprintf(stderr, "docproc: ");
|
fprintf(stderr, "docproc: ");
|
||||||
perror(argv[2]);
|
perror(argv[2]);
|
||||||
exit(2);
|
exit(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strcmp("doc", argv[1]) == 0) {
|
if (strcmp("doc", argv[1]) == 0) {
|
||||||
/* Need to do this in two passes.
|
/* Need to do this in two passes.
|
||||||
|
Loading…
Reference in New Issue
Block a user