History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: explain why DEBUG_SECTION_MISMATCH is UNDEFINED kbuild: fix building vmlinux.o kbuild: allow -fstack-protector to take effect kconfig: fix select in combination with default

Linus Torvalds committed 18 years ago

Commit 230b5482 parents 1309d4e fa2144b3 files · +31 −17Browse files

Showing the changes to scripts (1 of 3 files). Show all

Unified · Split

scripts/kconfig/symbol.c+21−13
@@ -298,22 +298,30 @@ void sym_calc_value(struct symbol *sym) · 297 unmodified lines
298298 if (sym_is_choice_value(sym) && sym->visible == yes) {
299299 prop = sym_get_choice_prop(sym);
300300 newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no;
301− } else if (EXPR_OR(sym->visible, sym->rev_dep.tri) != no) {
302− sym->flags |= SYMBOL_WRITE;
303− if (sym_has_value(sym))
304− newval.tri = sym->def[S_DEF_USER].tri;
305− else if (!sym_is_choice(sym)) {
306− prop = sym_get_default_prop(sym);
307− if (prop)
308− newval.tri = expr_calc_value(prop->expr);
301+ } else {
302+ if (sym->visible != no) {
303+ /* if the symbol is visible use the user value
304+ * if available, otherwise try the default value
305+ */
306+ sym->flags |= SYMBOL_WRITE;
307+ if (sym_has_value(sym)) {
308+ newval.tri = EXPR_AND(sym->def[S_DEF_USER].tri,
309+ sym->visible);
310+ goto calc_newval;
311+ }
309312 }
310− newval.tri = EXPR_OR(EXPR_AND(newval.tri, sym->visible), sym->rev_dep.tri);
311− } else if (!sym_is_choice(sym)) {
312− prop = sym_get_default_prop(sym);
313− if (prop) {
313+ if (sym->rev_dep.tri != no)
314314 sym->flags |= SYMBOL_WRITE;
315− newval.tri = expr_calc_value(prop->expr);
315+ if (!sym_is_choice(sym)) {
316+ prop = sym_get_default_prop(sym);
317+ if (prop) {
318+ sym->flags |= SYMBOL_WRITE;
319+ newval.tri = EXPR_AND(expr_calc_value(prop->expr),
320+ prop->visible.tri);
321+ }
316322 }
323+ calc_newval:
324+ newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
317325 }
318326 if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)
319327 newval.tri = yes;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t