svn commit: r275379 - head/share/mk

[Andrew Turner]

On Mon, 01 Dec 2014 14:36:22 -0700
Ian Lepore <ian at FreeBSD.org> wrote:

> On Mon, 2014-12-01 at 21:07 +0000, Andrew Turner wrote:
> > Author: andrew
> > Date: Mon Dec  1 21:07:36 2014
> > New Revision: 275379
> > URL: https://svnweb.freebsd.org/changeset/base/275379
> > 
> > Log:
> >   Set the correct architecture when targeting ARMv7
> >   
> >   MFC after:	1 Week
> >   Sponsored by:	ABT Systems Ltd
> > 
> > Modified:
> >   head/share/mk/bsd.cpu.mk
> > 
> > Modified: head/share/mk/bsd.cpu.mk
> > ==============================================================================
> > --- head/share/mk/bsd.cpu.mk	Mon Dec  1 21:04:26 2014
> > (r275378) +++ head/share/mk/bsd.cpu.mk	Mon Dec  1 21:07:36
> > 2014	(r275379) @@ -99,7 +99,7 @@ _CPUCFLAGS = -march=armv5te
> > -D__XSCALE__ . elif ${CPUTYPE} == "armv6"
> >  _CPUCFLAGS = -march=${CPUTYPE} -DARM_ARCH_6=1
> >  . elif ${CPUTYPE} == "cortexa"
> > -_CPUCFLAGS = -DARM_ARCH_6=1 -mfpu=vfp
> > +_CPUCFLAGS = -march=armv7 -DARM_ARCH_6=1 -mfpu=vfp
> >  .  else
> >  _CPUCFLAGS = -mcpu=${CPUTYPE}
> >  .  endif
> > 
> 
> Doesn't cortex-a also imply vfp3?

The vfp looks to be incorrect as it's optional on ARMv7. If present I
think it will be either a VFPv3 or v4 depending on the core.

I also think we could remove the "-DARM_ARCH_6=1" as, if it's used at
all, it can be replaced with a combination of <machine/acle-compat.h>
and __ARM_ARCH >= 6.

Andrew