[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1230558803-7168-5-git-send-email-sam@ravnborg.org>
Date: Mon, 29 Dec 2008 14:53:15 +0100
From: Sam Ravnborg <sam@...nborg.org>
To: linux-kbuild <linux-kbuild@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>
Cc: Sam Ravnborg <sam@...nborg.org>
Subject: [PATCH 05/13] kconfig: improve readout when we hit recursive dependencies
Following sample:
config TEST1
bool
depends on TEST2 && PCI
select TEST2
config TEST2
bool
Will result in the following output:
Kconfig:1:error: found recursive dependency:
TEST1
-> TEST2 (arch/x86/Kconfig:6)
-> TEST1 (arch/x86/Kconfig:1)
The sample above gave a segmentation fault
which is also fixed by this patch.
Signed-off-by: Sam Ravnborg <sam@...nborg.org>
---
scripts/kconfig/expr.h | 1 +
scripts/kconfig/menu.c | 2 ++
scripts/kconfig/symbol.c | 11 ++++++++---
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 6408fef..d587895 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -132,6 +132,7 @@ enum prop_type {
P_SELECT, /* select BAR */
P_RANGE, /* range 7..100 (for a symbol) */
P_ENV, /* value from environment variable */
+ P_SYMBOL, /* where a symbol is defined */
};
struct property {
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 07ff8d1..aa0e2f2 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -55,6 +55,8 @@ void menu_add_entry(struct symbol *sym)
*last_entry_ptr = menu;
last_entry_ptr = &menu->next;
current_entry = menu;
+ if (sym)
+ menu_add_prop(P_SYMBOL, NULL, NULL, NULL);
}
void menu_end_entry(void)
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 18f3e5c..474dae2 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -856,8 +856,9 @@ struct symbol *sym_check_deps(struct symbol *sym)
struct property *prop;
if (sym->flags & SYMBOL_CHECK) {
- fprintf(stderr, "%s:%d:error: found recursive dependency: %s",
- sym->prop->file->name, sym->prop->lineno,
+ fprintf(stderr, "%s:%d:error: found recursive dependency:\n",
+ sym->prop->file->name, sym->prop->lineno);
+ fprintf(stderr, "\t %s\n",
sym->name ? sym->name : "<choice>");
return sym;
}
@@ -877,7 +878,9 @@ struct symbol *sym_check_deps(struct symbol *sym)
}
if (sym2) {
- fprintf(stderr, " -> %s", sym->name ? sym->name : "<choice>");
+ fprintf(stderr, "\t -> %s (%s:%d)\n",
+ sym->name ? sym->name : "<choice>",
+ sym->prop->file->name, sym->prop->lineno);
if (sym2 == sym) {
fprintf(stderr, "\n");
zconfnerrs++;
@@ -937,6 +940,8 @@ const char *prop_get_type_name(enum prop_type type)
return "select";
case P_RANGE:
return "range";
+ case P_SYMBOL:
+ return "symbol";
case P_UNKNOWN:
break;
}
--
1.6.0.2.GIT
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists