Page MenuHomeFreeBSD
Files F156710757

D5605.id14227.diff
No OneTemporary
Actions

D5605.id14227.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -457,6 +457,9 @@
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
.include "Makefile.lib32"
.endif
+.if ${TARGET_ARCH} == "armv6"
+.include "Makefile.libsoft"
+.endif
WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
@@ -516,6 +519,9 @@
.if defined(LIB32TMP)
rm -rf ${LIB32TMP}
.endif
+.if defined(LIBSOFTTMP)
+ rm -rf ${LIBSOFTTMP}
+.endif
.else
rm -rf ${WORLDTMP}/legacy/usr/include
# XXX - These can depend on any header file.
@@ -554,6 +560,16 @@
-p ${WORLDTMP}/usr/lib/debug/usr >/dev/null
.endif
.endif
+.if ${MK_LIBSOFT} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.libsoft.dist \
+ -p ${WORLDTMP}/usr >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.libsoft.dist \
+ -p ${WORLDTMP}/legacy/usr/lib/debug/usr >/dev/null
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.libsoft.dist \
+ -p ${WORLDTMP}/usr/lib/debug/usr >/dev/null
+.endif
+.endif
.if ${MK_TESTS} != "no"
mkdir -p ${WORLDTMP}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
@@ -589,6 +605,9 @@
.if defined(LIB32TMP)
${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR}
.endif
+.if defined(LIBSOFTTMP)
+ ${_+_}cd ${.CURDIR}; ${LIBSOFTWMAKE} -f Makefile.inc1 ${CLEANDIR}
+.endif
.endif
_obj:
@echo
@@ -656,6 +675,9 @@
.if defined(LIB32TMP) && ${MK_LIB32} != "no" && empty(SUBDIR_OVERRIDE)
WMAKE_TGTS+= build32
.endif
+.if defined(LIBSOFTTMP) && ${MK_LIBSOFT} != "no" && empty(SUBDIR_OVERRIDE)
+WMAKE_TGTS+= buildsoft
+.endif
buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
@@ -694,7 +716,7 @@
@cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} \
|| true
-TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32}
+TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32:Nbuildsoft}
toolchain: ${TOOLCHAIN_TGTS}
kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
@@ -791,6 +813,9 @@
.if defined(LIB32TMP) && ${MK_LIB32} != "no"
EXTRA_DISTRIBUTIONS+= lib32
.endif
+.if defined(LIBSOFTTMP) && ${MK_LIBSOFT} != "no"
+EXTRA_DISTRIBUTIONS+= libsoft
+.endif
.if ${MK_TESTS} != "no"
EXTRA_DISTRIBUTIONS+= tests
.endif
@@ -849,6 +874,14 @@
-p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/usr >/dev/null
.endif
.endif
+.if ${MK_LIBSOFT} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.libsoft.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.libsoft.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/usr >/dev/null
+.endif
+.endif
.if ${MK_TESTS} != "no" && ${dist} == "tests"
-mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
@@ -869,6 +902,10 @@
${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.lib32.dist | \
sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
.endif
+.if ${MK_LIBSOFT} != "no"
+ ${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.libsoft.dist | \
+ sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
+.endif
.endif
.endfor
-mkdir ${DESTDIR}/${DISTDIR}/base
@@ -954,6 +991,9 @@
.if defined(LIB32TMP) && ${MK_LIB32} != "no"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
.endif
+.if defined(LIBSOFTTMP) && ${MK_LIBSOFT} != "no"
+ ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 installsoft
+.endif
redistribute: .MAKE .PHONY
@echo "--------------------------------------------------------------"
@@ -964,6 +1004,10 @@
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \
DISTRIBUTION=lib32
.endif
+.if defined(LIBSOFTTMP) && ${MK_LIBSOFT} != "no"
+ ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distributesoft \
+ DISTRIBUTION=libsoft
+.endif
distrib-dirs distribution: .MAKE .PHONY
${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
@@ -1025,7 +1069,7 @@
.endif
.endfor
-${WMAKE_TGTS:N_worldtmp:Nbuild32} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY
+${WMAKE_TGTS:N_worldtmp:Nbuild32:Nbuildsoft} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY
#
# buildkernel
@@ -2278,6 +2322,10 @@
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
-p ${XDDESTDIR}/usr >/dev/null
.endif
+.if ${MK_LIBSOFT} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.libsoft.dist \
+ -p ${XDDESTDIR}/usr >/dev/null
+.endif
.if ${MK_TESTS} != "no"
mkdir -p ${XDDESTDIR}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
Index: lib/Makefile
===================================================================
--- lib/Makefile
+++ lib/Makefile
@@ -172,7 +172,7 @@
_libcasper= libcasper
.endif
-.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT)
+.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) && !defined(COMPAT_SOFTFP)
_clang= clang
.endif
Index: share/mk/bsd.cpu.mk
===================================================================
--- share/mk/bsd.cpu.mk
+++ share/mk/bsd.cpu.mk
@@ -309,7 +309,7 @@
# armv6 is a hybrid. It uses the softfp ABI, but doesn't emulate
# floating point in the general case, so don't define softfp for
# it at this time. arm and armeb are pure softfp, so define it
-# for them.
+# for them. By default armv6 is hardfp ABI anyway.
. if ${MACHINE_ARCH:Marmv6*} == ""
MACHINE_CPU += softfp
. endif

File Metadata

Mime Type
text/plain
Expires
Sat, May 16, 8:14 PM (11 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33150381
Default Alt Text
D5605.id14227.diff (5 KB)

Event Timeline