OSDN Git Service

powerpc/32: Move the old 6xx -mcpu logic before the TARGET_CPU logic
authorMathieu Malaterre <malat@debian.org>
Wed, 5 Dec 2018 17:53:55 +0000 (18:53 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 17 Dec 2018 11:12:30 +0000 (22:12 +1100)
commitebd1d3b74f8542a8f3bb80b453692d6d18f84071
tree69bb542a0fcae5c5023e9bcbe42c3ab38a6c55ed
parentc7e900c05b8f10894b649bdae50cf58656088dd0
powerpc/32: Move the old 6xx -mcpu logic before the TARGET_CPU logic

The code:

  ifdef CONFIG_6xx
  KBUILD_CFLAGS          += -mcpu=powerpc
  endif

was added in 2006 in commit f48b8296b315 ("[PATCH] powerpc32: Set cpu
explicitly in kernel compiles"). This change was acceptable since the
TARGET_CPU logic was 64-bit only.

Since commit 0e00a8c9fd92 ("powerpc: Allow CPU selection
also on PPC32") this logic is no longer acceptable after the TARGET_CPU
specific. It currently appends -mcpu=powerpc at the end of the command
line, after any TARGET_CPU specific:

  gcc -Wp,-MD,init/.do_mounts.o.d ...
    -mcpu=powerpc -mbig-endian -m32 ...
    -mcpu=e300c2 ...
    -mcpu=powerpc ...
    ../init/do_mounts.c

Fixes: 0e00a8c9fd92 ("powerpc: Allow CPU selection also on PPC32")
Signed-off-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/Makefile