> Date: Fri, 9 Mar 2018 14:10:41 +0200
> From: Artturi Alm <[email protected]>
>
> On Tue, Mar 06, 2018 at 11:34:23PM +0200, Artturi Alm wrote:
> > Hi,
> >
> > was 'grepping' for something, and these came up.
> >
> > i guess atleast trampoline.S would work w/o including assym.h at all,
> > but here is what i'm sure enough of w/o actually compiling yet. :D
> >
> > -Artturi
> >
> >
> > diff --git sys/arch/arm64/conf/Makefile.arm64
> > sys/arch/arm64/conf/Makefile.arm64
> > index bd56f7a1427..f98d82ff0f7 100644
> > --- sys/arch/arm64/conf/Makefile.arm64
> > +++ sys/arch/arm64/conf/Makefile.arm64
> > @@ -143,9 +143,9 @@ cleandir: clean
> > depend obj:
> >
> > locore0.o: ${_archdir}/${_arch}/locore0.S assym.h
> > -in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o copy.o: assym.h
> > -cpuswitch.o exception.o bcopy_page.o irq_dispatch.o support.o: assym.h
> > -locore.o vectors.o trampoline.o: assym.h
> > +copy.o copystr.o.o: assym.h
> > +cpuswitch.o exception.o support.o: assym.h
> > +locore.o trampoline.o: assym.h
> >
> > hardlink-obsd:
> > [[ ! -f /bsd ]] || cmp -s bsd /bsd || ln -f /bsd /obsd
>
> diff below is what i ended up w/after fixing the extra '.o'-mistake in
> above diff. built&tested on pine64.
>
> -Artturi
I'm inclined to leave the assym.h includes even if those files
currently don't use any symbols from there. So I committed
essentially your first diff.
Thanks,
Mark
> diff --git sys/arch/arm64/arm64/support.S sys/arch/arm64/arm64/support.S
> index ea0212b59ae..cccfd2f51ae 100644
> --- sys/arch/arm64/arm64/support.S
> +++ sys/arch/arm64/arm64/support.S
> @@ -39,8 +39,6 @@ __FBSDID("$FreeBSD: head/sys/arm64/arm64/support.S 297615
> 2016-04-06 14:08:10Z a
> #include <machine/param.h>
> #include <machine/vmparam.h>
>
> -#include "assym.h"
> -
> #ifdef DDB
> ENTRY(setjmp)
> /* Store the stack pointer */
> diff --git sys/arch/arm64/arm64/trampoline.S sys/arch/arm64/arm64/trampoline.S
> index 4de835ddb5c..2f633918c5c 100644
> --- sys/arch/arm64/arm64/trampoline.S
> +++ sys/arch/arm64/arm64/trampoline.S
> @@ -18,7 +18,6 @@
>
> #include <machine/asm.h>
> #include <machine/param.h>
> -#include "assym.h"
>
> .text
>
> diff --git sys/arch/arm64/conf/Makefile.arm64
> sys/arch/arm64/conf/Makefile.arm64
> index bd56f7a1427..c56b597ba3c 100644
> --- sys/arch/arm64/conf/Makefile.arm64
> +++ sys/arch/arm64/conf/Makefile.arm64
> @@ -143,9 +143,9 @@ cleandir: clean
> depend obj:
>
> locore0.o: ${_archdir}/${_arch}/locore0.S assym.h
> -in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o copy.o: assym.h
> -cpuswitch.o exception.o bcopy_page.o irq_dispatch.o support.o: assym.h
> -locore.o vectors.o trampoline.o: assym.h
> +copy.o copystr.o: assym.h
> +cpuswitch.o exception.o: assym.h
> +locore.o: assym.h
>
> hardlink-obsd:
> [[ ! -f /bsd ]] || cmp -s bsd /bsd || ln -f /bsd /obsd
>
>
