[PATCH] m68k: Drop duplicate "core-y += arch/m68k/" rule causing link failures

[PATCH] m68k: Drop duplicate "core-y += arch/m68k/" rule causing link failures

[Geert Uytterhoeven]

    Makefile:1949: target 'arch/m68k' given more than once in the same rule
    [...]
      LD      vmlinux.o
    m68k-linux-gnu-ld: arch/m68k/kernel/entry.o: in function `system_call':
    (.text+0x160): multiple definition of `system_call'; arch/m68k/kernel/entry.o:(.text+0x160): first defined here
    [...]

All "core-y += arch/<arch>/" rules were dropped from the corresponding
arch/<arch>/Makefiles, but m68k was forgotten.

Reported-by: noreply@ellerman.id.au
Fixes: 7d9677835b10b5de ("kbuild: require all architectures to have arch/$(SRCARCH)/Kbuild")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 arch/m68k/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index c54055a3d28450aa..dd0c0ec67f67064d 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -97,7 +97,6 @@ head-$(CONFIG_SUN3)		:= arch/m68k/kernel/sun3-head.o
 head-$(CONFIG_M68000)		:= arch/m68k/68000/head.o
 head-$(CONFIG_COLDFIRE)		:= arch/m68k/coldfire/head.o
 
-core-y				+= arch/m68k/
 libs-y				+= arch/m68k/lib/
 
 
-- 
2.25.1

Re: [PATCH] m68k: Drop duplicate "core-y += arch/m68k/" rule causing link failures

[Masahiro Yamada]

On Wed, May 26, 2021 at 5:45 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
>     Makefile:1949: target 'arch/m68k' given more than once in the same rule
>     [...]
>       LD      vmlinux.o
>     m68k-linux-gnu-ld: arch/m68k/kernel/entry.o: in function `system_call':
>     (.text+0x160): multiple definition of `system_call'; arch/m68k/kernel/entry.o:(.text+0x160): first defined here
>     [...]
>
> All "core-y += arch/<arch>/" rules were dropped from the corresponding
> arch/<arch>/Makefiles, but m68k was forgotten.
>
> Reported-by: noreply@ellerman.id.au
> Fixes: 7d9677835b10b5de ("kbuild: require all architectures to have arch/$(SRCARCH)/Kbuild")
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---

I will squash this.
Thanks.


>  arch/m68k/Makefile | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
> index c54055a3d28450aa..dd0c0ec67f67064d 100644
> --- a/arch/m68k/Makefile
> +++ b/arch/m68k/Makefile
> @@ -97,7 +97,6 @@ head-$(CONFIG_SUN3)           := arch/m68k/kernel/sun3-head.o
>  head-$(CONFIG_M68000)          := arch/m68k/68000/head.o
>  head-$(CONFIG_COLDFIRE)                := arch/m68k/coldfire/head.o
>
> -core-y                         += arch/m68k/
>  libs-y                         += arch/m68k/lib/
>
>
> --
> 2.25.1
>


-- 
Best Regards
Masahiro Yamada

Re: [PATCH] m68k: Drop duplicate "core-y += arch/m68k/" rule causing link failures

[Geert Uytterhoeven]

Hi Yamada-san,

On Wed, May 26, 2021 at 4:24 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
> On Wed, May 26, 2021 at 5:45 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> >     Makefile:1949: target 'arch/m68k' given more than once in the same rule
> >     [...]
> >       LD      vmlinux.o
> >     m68k-linux-gnu-ld: arch/m68k/kernel/entry.o: in function `system_call':
> >     (.text+0x160): multiple definition of `system_call'; arch/m68k/kernel/entry.o:(.text+0x160): first defined here
> >     [...]
> >
> > All "core-y += arch/<arch>/" rules were dropped from the corresponding
> > arch/<arch>/Makefiles, but m68k was forgotten.
> >
> > Reported-by: noreply@ellerman.id.au
> > Fixes: 7d9677835b10b5de ("kbuild: require all architectures to have arch/$(SRCARCH)/Kbuild")
> > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > ---
>
> I will squash this.

Fine for me. Thx!

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds