Create one list of replacements for MACHINE_CPUARCH as MACHINE_CPUARCH_SUB.

This also adds missing s/aarch64/arm64 to the sys.mk version and also
adds back armv6hf for universe since it was added to the sys.mk version
in r300438.

MFC after:	3 days
Sponsored by:	EMC / Isilon Storage Division
Differential Revision:	https://reviews.freebsd.org/D7159

This commit is contained in:

Bryan Drewery

2016-07-12 18:57:25 +00:00

parent db16ab7ea0

commit 8a6bdc134d

6 changed files with 12 additions and 6 deletions

									
										Makefile
									
		+1
		-1
	
												View File
												
				@@ -235,7 +235,7 @@ _MAKE+=	MK_META_MODE=no

				_TARGET_ARCH=	${TARGET:S/pc98/i386/:S/arm64/aarch64/}

				.elif !defined(TARGET) && defined(TARGET_ARCH) && \

				    ${TARGET_ARCH} != ${MACHINE_ARCH}

				_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/}

				_TARGET=		${TARGET_ARCH:${MACHINE_CPUARCH_SUB:ts:}}

				.endif

				.if defined(TARGET) && !defined(_TARGET)

				_TARGET=${TARGET}