diff mbox series

powerpc: Fix -mcpu= options for SPE-only compiler

Message ID 20181226141511.3ag7uf6rvdgzlmxt@decadent.org.uk (mailing list archive)
State Superseded
Headers show
Series powerpc: Fix -mcpu= options for SPE-only compiler | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch success next/apply_patch Successfully applied
snowpatch_ozlabs/build-ppc64le success build succeeded & removed 0 sparse warning(s)
snowpatch_ozlabs/build-ppc64be success build succeeded & removed 0 sparse warning(s)
snowpatch_ozlabs/build-ppc64e success build succeeded & removed 0 sparse warning(s)
snowpatch_ozlabs/build-pmac32 success build succeeded & removed 0 sparse warning(s)
snowpatch_ozlabs/checkpatch success total: 0 errors, 0 warnings, 0 checks, 22 lines checked

Commit Message

Ben Hutchings Dec. 26, 2018, 2:15 p.m. UTC
GCC for Debian's "powerpcspe" architecture only supports 32-bit
SPE targets, and using -mcpu=powerpc or -mcpu=powerpc64 is a fatal
error.

* Change the test for a biarch compiler to pass both the -m32 and -m64
  options, so that it doesn't catch 32-bit-only compilers
* Add an ifdef CONFIG_PPC64 around the 64-bit CPU option definitions

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 arch/powerpc/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Segher Boessenkool Dec. 26, 2018, 11:45 p.m. UTC | #1
Hi!

On Wed, Dec 26, 2018 at 02:15:11PM +0000, Ben Hutchings wrote:
> GCC for Debian's "powerpcspe" architecture only supports 32-bit
> SPE targets, and using -mcpu=powerpc or -mcpu=powerpc64 is a fatal
> error.

I don't see where your patch touches -mcpu=powerpc, and I don't see how
it would make a difference either?

> +ifdef CONFIG_PPC64
>  ifdef CONFIG_PPC_BOOK3S_64
>  ifdef CONFIG_CPU_LITTLE_ENDIAN
>  CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8
> @@ -177,6 +178,7 @@ endif
>  else
>  CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
>  endif
> +endif

How can CONFIG_PPC_BOOK3S_64 be true while CONFIG_PPC64 is fals?  That
does not make a lot of sense.


Segher
Ben Hutchings Dec. 27, 2018, 2:32 a.m. UTC | #2
On Wed, 2018-12-26 at 17:45 -0600, Segher Boessenkool wrote:
> Hi!
> 
> On Wed, Dec 26, 2018 at 02:15:11PM +0000, Ben Hutchings wrote:
> > GCC for Debian's "powerpcspe" architecture only supports 32-bit
> > SPE targets, and using -mcpu=powerpc or -mcpu=powerpc64 is a fatal
> > error.
> 
> I don't see where your patch touches -mcpu=powerpc, and I don't see how
> it would make a difference either?

Look at the assignments that are conditional on HAS_BIARCH.

> > +ifdef CONFIG_PPC64
> >  ifdef CONFIG_PPC_BOOK3S_64
> >  ifdef CONFIG_CPU_LITTLE_ENDIAN
> >  CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8
> > @@ -177,6 +178,7 @@ endif
> >  else
> >  CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
> >  endif
> > +endif
> 
> How can CONFIG_PPC_BOOK3S_64 be true while CONFIG_PPC64 is fals?  That
> does not make a lot of sense.

But there is an "else" part here.

Ben.
Segher Boessenkool Dec. 29, 2018, 11:40 a.m. UTC | #3
On Thu, Dec 27, 2018 at 02:32:07AM +0000, Ben Hutchings wrote:
> On Wed, 2018-12-26 at 17:45 -0600, Segher Boessenkool wrote:
> > Hi!
> > 
> > On Wed, Dec 26, 2018 at 02:15:11PM +0000, Ben Hutchings wrote:
> > > GCC for Debian's "powerpcspe" architecture only supports 32-bit
> > > SPE targets, and using -mcpu=powerpc or -mcpu=powerpc64 is a fatal
> > > error.
> > 
> > I don't see where your patch touches -mcpu=powerpc, and I don't see how
> > it would make a difference either?

[ I now see that error fwiw.  Yuck. ]

> Look at the assignments that are conditional on HAS_BIARCH.

Sure, you change how HAS_BIARCH is set.  That has more effects than just
not using -mcpu=powerpc (which is fine, but the message is confusing).

> > > +ifdef CONFIG_PPC64
> > >  ifdef CONFIG_PPC_BOOK3S_64
> > >  ifdef CONFIG_CPU_LITTLE_ENDIAN
> > >  CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8
> > > @@ -177,6 +178,7 @@ endif
> > >  else
> > >  CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
> > >  endif
> > > +endif
> > 
> > How can CONFIG_PPC_BOOK3S_64 be true while CONFIG_PPC64 is fals?  That
> > does not make a lot of sense.
> 
> But there is an "else" part here.

Yeah I see.  It would be better to have fewer nested conditionals here
instead of more...


Segher
diff mbox series

Patch

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 488c9edffa58..c2e815863500 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -12,7 +12,7 @@ 
 # Rewritten by Cort Dougan and Paul Mackerras
 #
 
-HAS_BIARCH	:= $(call cc-option-yn, -m32)
+HAS_BIARCH	:= $(call cc-option-yn, -m32 -m64)
 
 # Set default 32 bits cross compilers for vdso and boot wrapper
 CROSS32_COMPILE ?=
@@ -166,6 +166,7 @@  CFLAGS-$(CONFIG_PPC32)	+= $(call cc-option, $(MULTIPLEWORD))
 
 CFLAGS-$(CONFIG_PPC32)	+= $(call cc-option,-mno-readonly-in-sdata)
 
+ifdef CONFIG_PPC64
 ifdef CONFIG_PPC_BOOK3S_64
 ifdef CONFIG_CPU_LITTLE_ENDIAN
 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8
@@ -177,6 +178,7 @@  endif
 else
 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
 endif
+endif
 
 ifdef CONFIG_FUNCTION_TRACER
 CC_FLAGS_FTRACE := -pg