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

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
  kbuild: introduce ccflags-y, asflags-y and ldflags-y
  kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
  kbuild: enable use of AFLAGS and CFLAGS on commandline
  kbuild: enable 'make AFLAGS=...' to add additional options to AS
  kbuild: fix AFLAGS use in h8300 and m68knommu
  kbuild: check for wrong use of CFLAGS
  kbuild: enable 'make CFLAGS=...' to add additional options to CC
  kbuild: fix up CFLAGS usage
  kbuild: make modpost detect unterminated device id lists
  kbuild: call export_report from the Makefile
  kbuild: move Kai Germaschewski to CREDITS
  kconfig/menuconfig: distinguish between selected-by-another options and comments
  kconfig: tristate choices with mixed tristate and boolean values
  include/linux/Kbuild: remove duplicate entries
  kbuild: kill backward compatibility checks
  kbuild: kill EXTRA_ARFLAGS
  kbuild: fix documentation in makefiles.txt
  kbuild: call make once for all targets when O=.. is used
  kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
  kbuild: update _shipped files for kconfig syntax cleanup
  ...

Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.

1 files changed, 26 insertions, 9 deletions

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index f9d0d91a3fe4..7bfa181d6ed6 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -235,16 +235,23 @@ void menu_finalize(struct menu *parent)
         sym = parent->sym;
         if (parent->list) {
                 if (sym && sym_is_choice(sym)) {
-                        /* find the first choice value and find out choice type */
+                        /* find out choice type */
+                        enum symbol_type type = S_UNKNOWN;
+
                         for (menu = parent->list; menu; menu = menu->next) {
-                                if (menu->sym) {
-                                        current_entry = parent;
-                                        menu_set_type(menu->sym->type);
-                                        current_entry = menu;
-                                        menu_set_type(sym->type);
-                                        break;
+                                if (menu->sym && menu->sym->type != S_UNKNOWN) {
+                                        if (type == S_UNKNOWN)
+                                                type = menu->sym->type;
+                                        if (type != S_BOOLEAN)
+                                                break;
+                                        if (menu->sym->type == S_TRISTATE) {
+                                                type = S_TRISTATE;
+                                                break;
+                                        }
                                 }
                         }
+                        current_entry = parent;
+                        menu_set_type(type);
                         parentdep = expr_alloc_symbol(sym);
                 } else if (parent->prompt)
                         parentdep = parent->prompt->visible.expr;
@@ -253,7 +260,16 @@ void menu_finalize(struct menu *parent)
 
                 for (menu = parent->list; menu; menu = menu->next) {
                         basedep = expr_transform(menu->dep);
-                        basedep = expr_alloc_and(expr_copy(parentdep), basedep);
+                        dep = parentdep;
+                        if (sym && sym_is_choice(sym) && menu->sym) {
+                                enum symbol_type type = menu->sym->type;
+
+                                if (type == S_UNKNOWN)
+                                        type = sym->type;
+                             if (type != S_TRISTATE)
+                                        dep = expr_alloc_comp(E_EQUAL, sym, &symbol_yes);
+                        }
+                        basedep = expr_alloc_and(expr_copy(dep), basedep);
                         basedep = expr_eliminate_dups(basedep);
                         menu->dep = basedep;
                         if (menu->sym)
@@ -326,7 +342,8 @@ void menu_finalize(struct menu *parent)
                                             "values not supported");
                         }
                         current_entry = menu;
-                        menu_set_type(sym->type);
+                        if (menu->sym->type == S_UNKNOWN)
+                                menu_set_type(sym->type);
                         menu_add_symbol(P_CHOICE, sym, NULL);
                         prop = sym_get_choice_prop(sym);
                         for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr)