D45643.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45643.diff
View Options

	diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
	--- a/share/mk/bsd.cpu.mk
	+++ b/share/mk/bsd.cpu.mk
	@@ -315,13 +315,10 @@
	########## arm
	.if ${MACHINE_CPUARCH} == "arm"
	MACHINE_CPU += arm
	-. if ${MACHINE_ARCH:Marmv6*} != ""
	-MACHINE_CPU += armv6
	-. endif
	. if ${MACHINE_ARCH:Marmv7*} != ""
	MACHINE_CPU += armv7
	. endif
	-# Normally armv6 and armv7 are hard float ABI from FreeBSD 11 onwards. However
	+# Normally armv7 is hard float ABI from FreeBSD 11 onwards. However
	# when CPUTYPE has 'soft' in it, we use the soft-float ABI to allow building of
	# soft-float ABI libraries. In this case, we have to add the -mfloat-abi=softfp
	# to force that.
	diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
	--- a/share/mk/bsd.opts.mk
	+++ b/share/mk/bsd.opts.mk
	@@ -95,7 +95,7 @@
	# means that ASLR is of limited effectiveness, and it may cause issues with
	# some memory-hungry workloads.
	#
	-.if ${MACHINE_ARCH} == "armv6" \|\| ${MACHINE_ARCH} == "armv7" \
	+.if ${MACHINE_ARCH} == "armv7" \
	\|\| ${MACHINE_ARCH} == "i386" \|\| ${MACHINE_ARCH} == "powerpc" \
	\|\| ${MACHINE_ARCH} == "powerpcspe"
	__DEFAULT_NO_OPTIONS+= PIE