Re: [PATCH 2/3] crosstool: linux 2.6.8 builds with gcc-3.4.2

[Horms <horms at verge dot net dot au>]

This patch was taken from the historical linux-2.6 git tree,
http://www.kernel.org/git/?p=linux/kernel/git/tglx/history.git;a=commit;h=c794e99c91d095ad07349222ff7a6be1c52d9153

It reverses and fixes this more completely than patch 1 in this series
that I am posting.

Signed-off-by: Horms <horms@verge.net.au>

commit c794e99c91d095ad07349222ff7a6be1c52d9153
tree 84791e64e3c153f036284d7b5fe58143c4e77e92
parent 3c3f504a6d82cfaf7a82c613c8d8bac6c21b083d
author Roman Zippel <zippel@linux-m68k.org> 1095129197 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> 1095129197 -0700

[PATCH] properly fix double current_menu

The two current_menu variables are really two separate variables, so keep
them separate.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 scripts/kconfig/lkc.h   |    3 ---
 scripts/kconfig/mconf.c |    2 +-
 scripts/kconfig/menu.c  |    1 -
 scripts/kconfig/zconf.y |    2 ++
 4 files changed, 3 insertions(+), 5 deletions(-)

c794e99c91d095ad07349222ff7a6be1c52d9153
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index dd040f7..e348ee7 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -59,9 +59,6 @@ void menu_set_type(int type);
 struct file *file_lookup(const char *name);
 int file_write_dep(const char *name);
 
-extern struct menu *current_entry;
-extern struct menu *current_menu;
-
 /* symbol.c */
 void sym_init(void);
 void sym_clear_all_valid(void);
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 070213e..91789cc 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -89,7 +89,7 @@ static char *args[1024], **argptr = args
 static int indent;
 static struct termios ios_org;
 static int rows = 0, cols = 0;
-struct menu *current_menu;
+static struct menu *current_menu;
 static int child_count;
 static int do_resize;
 static int single_menu_mode;
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 38046c6..7b26f98 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -10,7 +10,6 @@ #define LKC_DIRECT_LINK
 #include "lkc.h"
 
 struct menu rootmenu;
-struct menu *current_menu, *current_entry;
 static struct menu **last_entry_ptr;
 
 struct file *file_list;
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 459b690..aad1f51 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -25,6 +25,8 @@ static bool zconf_endtoken(int token, in
 
 struct symbol *symbol_hash[257];
 
+static struct menu *current_menu, *current_entry;
+
 #define YYERROR_VERBOSE
 %}
 %expect 40

--
For unsubscribe information see http://sourceware.org/lists.html#faq