Date: Mon, 2 Jan 2012 09:48:47 +0000 (UTC) From: Grzegorz Bernacki <gber@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r229267 - in projects/armv6: share/mk sys/arm/include sys/arm/mv Message-ID: <201201020948.q029mlXq057930@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gber Date: Mon Jan 2 09:48:46 2012 New Revision: 229267 URL: http://svn.freebsd.org/changeset/base/229267 Log: Set ARM_ARCH_6 when CPUTYPE is set to armv6. Different set of atomic function should be compiled when armv6 is used, so when userland is built it has to know which architecture it will be used for. Now CPUTYPE=armv6 is used to tell that kernel and userland are built for armv6. Obtained from: Marvell, Semihalf Modified: projects/armv6/share/mk/bsd.cpu.mk projects/armv6/sys/arm/include/cpuconf.h projects/armv6/sys/arm/mv/std-pj4b.mv Modified: projects/armv6/share/mk/bsd.cpu.mk ============================================================================== --- projects/armv6/share/mk/bsd.cpu.mk Mon Jan 2 09:44:42 2012 (r229266) +++ projects/armv6/share/mk/bsd.cpu.mk Mon Jan 2 09:48:46 2012 (r229267) @@ -98,6 +98,8 @@ _CPUCFLAGS = -march=${CPUTYPE} #XXX: gcc doesn't seem to like -mcpu=xscale, and dies while rebuilding itself #_CPUCFLAGS = -mcpu=xscale _CPUCFLAGS = -march=armv5te -D__XSCALE__ +. elif ${CPUTYPE} == "armv6" +_CPUCFLAGS = -march=${CPUTYPE} -DARM_ARCH_6 . else _CPUCFLAGS = -mcpu=${CPUTYPE} . endif Modified: projects/armv6/sys/arm/include/cpuconf.h ============================================================================== --- projects/armv6/sys/arm/include/cpuconf.h Mon Jan 2 09:44:42 2012 (r229266) +++ projects/armv6/sys/arm/include/cpuconf.h Mon Jan 2 09:48:46 2012 (r229267) @@ -88,12 +88,6 @@ #define ARM_ARCH_5 0 #endif -#if defined(CPU_ARM11) || defined(CPU_MV_PJ4B) -#define ARM_ARCH_6 1 -#else -#define ARM_ARCH_6 0 -#endif - #if defined(CPU_CORTEXA) #define ARM_ARCH_7A 1 #else Modified: projects/armv6/sys/arm/mv/std-pj4b.mv ============================================================================== --- projects/armv6/sys/arm/mv/std-pj4b.mv Mon Jan 2 09:44:42 2012 (r229266) +++ projects/armv6/sys/arm/mv/std-pj4b.mv Mon Jan 2 09:48:46 2012 (r229267) @@ -2,6 +2,5 @@ files "../mv/files.mv" cpu CPU_MV_PJ4B -makeoptions CONF_CFLAGS="-march=armv6" options VM_MAXUSER_ADDRESS="(KERNBASE-(1024*1024*1024))"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201020948.q029mlXq057930>