Use the newly minted Makefile.libcompat to implement libsoft libraries

for the armv6 ABI switch. This also make WITH_LIBSOFT functional on
the arm platform. As a transition thing, this seems to work even
without switching the ABI (we basically build the same libraries
twice when MK_LIBSOFT=yes until the ABI cut over next
month). MK_LIBSOFT remains default no.

This commit is contained in:

Warner Losh

2016-03-12 23:25:05 +00:00

parent 2c4f4af7a8

commit bb52d711d0

4 changed files with 16 additions and 3 deletions

									
										Makefile.libcompat
									
		+10
		-1
	
												View File
												
				@@ -39,11 +39,20 @@ LIB32CFLAGS=	-m32 -DCOMPAT_32BIT

				LIB32DTRACE=	${DTRACE} -32

				LIB32WMAKEFLAGS+=	-DCOMPAT_32BIT

				# -------------------------------------------------------------------

				# soft-fp world

				.if ${TARGET_ARCH} == "armv6"

				LIBSOFTCFLAGS=        -DCOMPAT_SOFTFP

				LIBSOFTCPUFLAGS= -mfloat-abi=softfp

				LIBSOFTWMAKEENV= CPUTYPE=soft MACHINE=arm MACHINE_ARCH=armv6

				LIBSOFTWMAKEFLAGS=        -DCOMPAT_SOFTFP

				.endif

				# -------------------------------------------------------------------

				# Generic code for each type.

				# Set defaults based on type.

				libcompat=	${LIBCOMPAT:tl}

				_LIBCOMPAT_MAKEVARS=	_OBJTREE TMP CFLAGS WMAKEENV WMAKEFLAGS WMAKE

				_LIBCOMPAT_MAKEVARS=	_OBJTREE TMP CPUFLAGS CFLAGS WMAKEENV WMAKEFLAGS WMAKE

				.for _var in ${_LIBCOMPAT_MAKEVARS}

				.if !empty(LIB${LIBCOMPAT}${_var})

				LIBCOMPAT${_var}?=	${LIB${LIBCOMPAT}${_var}}