2009-04-23 06:07:23

by Stephen Rothwell

Subject: linux-next: upstream tree build failure

Hi all,

[I am now using gcc version 4.4.0 ...]

Today's linux-next build (powerpc ppc44x_defconfig) failed like this:

arch/powerpc/mm/tlb_nohash_low.S:206:6: error: #elif with no expression

Previous gcc versions didn't notice this because one of the preceding
#ifs always evaluated to true. I have applied the following patch for today.

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <[email protected]>
Date: Thu, 23 Apr 2009 16:00:47 +1000
Subject: [PATCH] powerpc: fix for long standing bug noticed by gcc 4.4.0

Previous gcc versions didn't notice this because one of the preceding

gcc 4.4.0 produced this error:

arch/powerpc/mm/tlb_nohash_low.S:206:6: error: #elif with no expression

Signed-off-by: Stephen Rothwell <[email protected]>
---
arch/powerpc/mm/tlb_nohash_low.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S
index 45fed36..21e1b9a 100644
--- a/arch/powerpc/mm/tlb_nohash_low.S
+++ b/arch/powerpc/mm/tlb_nohash_low.S
@@ -203,6 +203,6 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_USE_TLBILX)
isync
1: wrtee r10
blr
-#elif
+#else
#error Unsupported processor type !
#endif
--
1.6.2.3

2009-04-23 10:34:54

by Josh Boyer

Subject: Re: linux-next: upstream tree build failure

On Thu, Apr 23, 2009 at 04:06:56PM +1000, Stephen Rothwell wrote:
>Hi all,
>
>[I am now using gcc version 4.4.0 ...]
>
>Today's linux-next build (powerpc ppc44x_defconfig) failed like this:
>
>arch/powerpc/mm/tlb_nohash_low.S:206:6: error: #elif with no expression
>
>Previous gcc versions didn't notice this because one of the preceding
>#ifs always evaluated to true. I have applied the following patch for today.
>
>--
>Cheers,
>Stephen Rothwell [email protected]
>http://www.canb.auug.org.au/~sfr/
>
>From: Stephen Rothwell <[email protected]>
>Date: Thu, 23 Apr 2009 16:00:47 +1000
>Subject: [PATCH] powerpc: fix for long standing bug noticed by gcc 4.4.0
>
>Previous gcc versions didn't notice this because one of the preceding
>
>gcc 4.4.0 produced this error:
>
>arch/powerpc/mm/tlb_nohash_low.S:206:6: error: #elif with no expression
>
>Signed-off-by: Stephen Rothwell <[email protected]>

Your changelog got truncated in the first sentence. No big deal.

I have a gcc 4.4.0 system as well. I'll try a bunch of various builds to see
if it catches anything else. This fix looks good to me in the meantime.

Acked-by: Josh Boyer <[email protected]>

josh

>---
> arch/powerpc/mm/tlb_nohash_low.S | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S
>index 45fed36..21e1b9a 100644
>--- a/arch/powerpc/mm/tlb_nohash_low.S
>+++ b/arch/powerpc/mm/tlb_nohash_low.S
>@@ -203,6 +203,6 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_USE_TLBILX)
> isync
> 1: wrtee r10
> blr
>-#elif
>+#else
> #error Unsupported processor type !
> #endif

2009-04-23 12:56:24

by Stephen Rothwell

Subject: [PATCH v2] powerpc: fix for long standing bug noticed by gcc 4.4.0

Previous gcc versions didn't notice this because one of the preceding
#ifs always evaluated to true.

gcc 4.4.0 produced this error:

arch/powerpc/mm/tlb_nohash_low.S:206:6: error: #elif with no expression

Signed-off-by: Stephen Rothwell <[email protected]>
Acked-by: Josh Boyer <[email protected]>
---
arch/powerpc/mm/tlb_nohash_low.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

v2: fixed up commit message, added Josh'd Ack.

diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S
index 45fed36..21e1b9a 100644
--- a/arch/powerpc/mm/tlb_nohash_low.S
+++ b/arch/powerpc/mm/tlb_nohash_low.S
@@ -203,6 +203,6 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_USE_TLBILX)
isync
1: wrtee r10
blr
-#elif
+#else
#error Unsupported processor type !
#endif
--
1.6.2.3


--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

2009-04-23 13:55:44

by Kumar Gala

Subject: Re: [PATCH v2] powerpc: fix for long standing bug noticed by gcc 4.4.0

On Apr 23, 2009, at 7:56 AM, Stephen Rothwell wrote:

> Previous gcc versions didn't notice this because one of the preceding
> #ifs always evaluated to true.
>
> gcc 4.4.0 produced this error:
>
> arch/powerpc/mm/tlb_nohash_low.S:206:6: error: #elif with no
> expression
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> Acked-by: Josh Boyer <[email protected]>
> ---
> arch/powerpc/mm/tlb_nohash_low.S | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> v2: fixed up commit message, added Josh'd Ack.

applied to merge. Picking this up as I'm touching tlb_nohash_low.S w/
another "fix".

- k