Re: 2.6.23-rc1-mm1: git-kgdb breaks sh compilation

Paul Mundt
2007-07-26T01:45:50Z

On Wed, Jul 25, 2007 at 11:17:41PM +0200, Adrian Bunk wrote:
> On Wed, Jul 25, 2007 at 04:03:04AM -0700, Andrew Morton wrote:
> >...
> > Changes since 2.6.22-rc6-mm1:
> >...
> > git-kgdb.patch
> >
> > git trees
> >...
>
> This causes the following compile error on sh:
>
> <-- snip -->
>
> ...
> CC drivers/serial/sh-sci.o
> drivers/serial/sh-sci.c: In function 'put_string':
> drivers/serial/sh-sci.c:188: error: 'hexchars' undeclared (first use in this function)
> drivers/serial/sh-sci.c:188: error: (Each undeclared identifier is reported only once
> drivers/serial/sh-sci.c:188: error: for each function it appears in.)
> make[3]: *** [drivers/serial/sh-sci.o] Error 1
>
> <-- snip -->
>
Cool, it's like 5 years ago all over again. It looks like most of
the kgdb stuff is going to need to be re-ported, as it's effectively
thrown out years of changes, and perhaps not surprisingly, blows up quite
spectacularly in the process.

At least this problem with KGDB disabled is an easy fix. I'll see about
getting CONFIG_KGDB=y resynced with the current serial driver and arch
stub.

-----

serial: sh-sci: Fix build failure from kgdb fallout.

CC drivers/serial/sh-sci.o
drivers/serial/sh-sci.c: In function 'put_string':
drivers/serial/sh-sci.c:188: error: 'hexchars' undeclared (first use in this function)
drivers/serial/sh-sci.c:188: error: (Each undeclared identifier is reported only once
drivers/serial/sh-sci.c:188: error: for each function it appears in.)
make[3]: *** [drivers/serial/sh-sci.o] Error 1

Reported-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

--

drivers/serial/sh-sci.c | 1 +
1 file changed, 1 insertion(+)

diff -X linux-2.6.23-rc1-mm1/Documentation/dontdiff -urN linux-2.6.23-rc1-mm1.orig/drivers/serial/sh-sci.c linux-2.6.23-rc1-mm1/drivers/serial/sh-sci.c
--- linux-2.6.23-rc1-mm1.orig/drivers/serial/sh-sci.c 2007-07-26 10:23:51.000000000 +0900
+++ linux-2.6.23-rc1-mm1/drivers/serial/sh-sci.c 2007-07-26 10:34:59.000000000 +0900
@@ -161,6 +161,7 @@

#if defined(CONFIG_SH_STANDARD_BIOS) || defined(CONFIG_SH_KGDB)
int checksum;
+ const char hexchars[] = "0123456789abcdef";
int usegdb=0;

#ifdef CONFIG_SH_STANDARD_BIOS