From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Tue, 2 Aug 2016 20:48:42 +0000 (+0200)
Subject: Synchronise with v4.6
X-Git-Tag: v4.6.0.0^0
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=92b9c6ce5af7b957c1ba76437f7f3833f82d153a;p=kconfig-frontends

Synchronise with v4.6

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---

diff --git a/.version b/.version
index 70d457e..e50d722 100644
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-4.5.0 b562e44f507e863c6792946e4e1b1449fbbac85d Blurry Fish Butt
+4.6.0 2dcd0af568b0cf583645c8a317dd12e344b1c72a Charred Weasel
 0
diff --git a/libs/parser/confdata.c b/libs/parser/confdata.c
index 0b7dc2f..dd243d2 100644
--- a/libs/parser/confdata.c
+++ b/libs/parser/confdata.c
@@ -267,10 +267,8 @@ int conf_read_simple(const char *name, int def)
 		if (in)
 			goto load;
 		sym_add_change_count(1);
-		if (!sym_defconfig_list) {
-			sym_calc_value(modules_sym);
+		if (!sym_defconfig_list)
 			return 1;
-		}
 
 		for_all_defaults(sym_defconfig_list, prop) {
 			if (expr_calc_value(prop->visible.expr) == no ||
@@ -403,7 +401,6 @@ setsym:
 	}
 	free(line);
 	fclose(in);
-	sym_calc_value(modules_sym);
 	return 0;
 }
 
@@ -414,8 +411,12 @@ int conf_read(const char *name)
 
 	sym_set_change_count(0);
 
-	if (conf_read_simple(name, S_DEF_USER))
+	if (conf_read_simple(name, S_DEF_USER)) {
+		sym_calc_value(modules_sym);
 		return 1;
+	}
+
+	sym_calc_value(modules_sym);
 
 	for_all_symbols(i, sym) {
 		sym_calc_value(sym);
@@ -846,6 +847,7 @@ static int conf_split_config(void)
 
 	name = conf_get_autoconfig_name();
 	conf_read_simple(name, S_DEF_AUTO);
+	sym_calc_value(modules_sym);
 
 	if (chdir("include/config"))
 		return 1;
diff --git a/scripts/ksync.log b/scripts/ksync.log
index 27b5a78..6505918 100644
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -159,3 +159,4 @@ be596aa Add current selection check.
 74dba80 kconfig: allow kconfig to handle longer path names
 aab24a8 kconfig: return 'false' instead of 'no' in bool function
 5b61c7b kconfig: fix qconf segfault by deleting heap objects
+6b87b70 unbreak allmodconfig KCONFIG_ALLCONFIG=...