X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=config%2Fsymbol.c;fp=config%2Fsymbol.c;h=3dc81397d0038495a4a9a11925990a42fedf46ce;hp=b101ef3c377a6b98d76e8d93a3c5be1c45d8fb7f;hb=35b87fb25488f2369ab85be61c68a64f83efb6dd;hpb=f82e10266427f3183c67f2264bd7555066c4e567 diff --git a/config/symbol.c b/config/symbol.c index b101ef3..3dc8139 100644 --- a/config/symbol.c +++ b/config/symbol.c @@ -221,7 +221,7 @@ static void sym_calc_visibility(struct symbol *sym) sym_set_changed(sym); } tri = no; - if (sym->implied.expr && sym->dir_dep.tri != no) + if (sym->implied.expr) tri = expr_calc_value(sym->implied.expr); if (tri == mod && sym_get_type(sym) == S_BOOLEAN) tri = yes; @@ -394,6 +394,8 @@ void sym_calc_value(struct symbol *sym) if (sym->implied.tri != no) { sym->flags |= SYMBOL_WRITE; newval.tri = EXPR_OR(newval.tri, sym->implied.tri); + newval.tri = EXPR_AND(newval.tri, + sym->dir_dep.tri); } } calc_newval: