From nobody Mon Jun 13 17:35:56 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BD833834870; Mon, 13 Jun 2022 17:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LMJd852Rwz4td8; Mon, 13 Jun 2022 17:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZPmepNf8M7PW4AJaN7yr4bsTDBUWByP/EZbj4e66Dls=; b=m+Iv2HT4XX+ulZ8ilKFFsOQvMlCYgjbMjTP2f9YrBixf+PHHxesJbStN19z0RZM0kBxw74 R6BYm/C0zzIn3STNHdT+eB4HcSAKHuaVxz0H3llBu92hawmiPd9A67bz4oRoyQvWn/f5eL x5F/eqZiI6gDfvFXS85bJv0Ki6pTdZWPaKJTmWvTSM/76mbR/COhg0okCyon2IPJoNZaRD qhwO3Ns1oXouAYJqMcW2kMH/MlU59iQy5Oq4QEBnMvU7eX2PxP/Jdytbp4JoIOmeQAjL6s LmM2ffS8fG3bVy7aZHpILXXVfGuKnC4MUuKF1K7dmkyGuCwFVlbLtFHYqiOylg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8306119FB4; Mon, 13 Jun 2022 17:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25DHZu4m061147; Mon, 13 Jun 2022 17:35:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHZunp061146; Mon, 13 Jun 2022 17:35:56 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:35:56 GMT Message-Id: <202206131735.25DHZunp061146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: a09ea2bbc305 - main - amd64: add an i386 include directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a09ea2bbc3053d3b2afdb2f7444e5e57a96bb891 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZPmepNf8M7PW4AJaN7yr4bsTDBUWByP/EZbj4e66Dls=; b=yGtvCSfwu+8PD/z+/XojCF4eKTGMOJsA1z/KCeEjho2u5FUfWLMGogwvXeHAJUCT2GORpi /6sCYt9WRSrs0ikvZrfP7ZhXMiVqgil9Qst4z8+x9Sl6YTA3lhFgr70IYX04cNvp0zBwyW bH9+6z2a2tLBbZdJm6v1HjdWrqqewjOfFfUSEvgOl2z9unUfZBr5tOkfS2rbFyGEfD3BE1 6ZcxNNWeyjFW3j6xuaJ6s31AC8cU2jgu3YaLixvzVvzgEQwIiavybRWLYUVnH/qxX3xQo6 sFyiFsFhabxauodt8+2F7NVlojfIl9009vhKQu23ry4tseKsvsqU95Zk+w5slg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141756; a=rsa-sha256; cv=none; b=LRNGTcRJM9tTeyd4RVeOxjHlOEo0fhPXYEoO8OXJV3dBKy6mgCNJW231xTWKSV2cVAXoa0 d+xtDQCWW4lXS/fLng9RwTQyoBit6taOEk1WjUGfcR1LyiEs91xjGiKVZNwIlAckhaHAeb bcj8kyZH51WJ1YBtPscbSbSi6CatubeeFhPphP+Uf8auFoJv1LCDLynqQbW5TxCt0Weupg teC/SHfogxlN7Z4bYISgm4ipSh2r9d89HWTExduFJd52sNBForG4XaGccqKntwl874uecF jcpbF3rwi0Opx4mjlTfA3A3VARnFLCfZcRhC71Z7+IjdDh3vtxdAWhdzaqxWBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a09ea2bbc3053d3b2afdb2f7444e5e57a96bb891 commit a09ea2bbc3053d3b2afdb2f7444e5e57a96bb891 Author: Brooks Davis AuthorDate: 2022-06-13 17:35:38 +0000 Commit: Brooks Davis CommitDate: 2022-06-13 17:35:38 +0000 amd64: add an i386 include directory This directory will hold i386-specific headers that are needed for -m32 support on amd64 and where the amd64 and i386 cases have too little in common for combining them to make sense. Files to be installed will come in later commits. With the currently required set of files, this could be done with another INCGROUP in include/Makefile, but at least one file that might want -m32 support (ieeefp.h) conflicts with a files installed in /usr/include. Reviewed by: jhb, imp --- Makefile.inc1 | 15 +++++++++++++++ include/Makefile | 7 +++++++ include/i386/Makefile | 7 +++++++ 3 files changed, 29 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5aaa9a414473..20c537512273 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1062,6 +1062,9 @@ _bootstrap-tools: -p ${WORLDTMP}/usr >/dev/null ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null +.if ${TARGET_ARCH} == "amd64" + mkdir -p ${WORLDTMP}/usr/include/i386 +.endif ln -sf ${.CURDIR}/sys ${WORLDTMP} .if ${MK_DEBUG_FILES} != "no" ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ @@ -1395,6 +1398,9 @@ distributeworld installworld stageworld: _installcheck_world .PHONY -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null +.if ${TARGET_ARCH} == "amd64" + -mkdir ${DESTDIR}/${DISTDIR}/usr/include/i386 +.endif .if ${MK_DEBUG_FILES} != "no" ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null @@ -1423,6 +1429,9 @@ distributeworld installworld stageworld: _installcheck_world .PHONY sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG} ${IMAKEENV} ${DISTR_MTREE} -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \ sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG} +.if ${TARGET_ARCH} == "amd64" + echo "./${dist}/usr/include/i386 type=dir uname=root gname=wheel mode=0755" >> ${METALOG} +.endif .if defined(_LIBCOMPAT) ${IMAKEENV} ${DISTR_MTREE} -C -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist | \ sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG} @@ -2852,6 +2861,9 @@ native-xtools-install: .PHONY -p ${NXBDESTDIR}/usr >/dev/null ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${NXBDESTDIR}/usr/include >/dev/null +.if ${TARGET_ARCH} == "amd64" + mkdir -p ${NXBDESTDIR}/usr/include/i386 +.endif ${_+_}cd ${.CURDIR}; ${NXBMAKE} \ DESTDIR=${NXBDESTDIR} \ -DNO_ROOT \ @@ -3545,6 +3557,9 @@ _xi-mtree: .PHONY -p ${XDDESTDIR}/usr >/dev/null ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${XDDESTDIR}/usr/include >/dev/null +.if ${TARGET_ARCH} == "amd64" + mkdir -p ${XDDESTDIR}/usr/include/i386 +.endif .if defined(_LIBCOMPAT) ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \ -p ${XDDESTDIR}/usr >/dev/null diff --git a/include/Makefile b/include/Makefile index 42590b900442..8d847a3a8dd2 100644 --- a/include/Makefile +++ b/include/Makefile @@ -8,6 +8,9 @@ PACKAGE=runtime CLEANFILES= osreldate.h version SUBDIR= arpa protocols rpcsvc rpc xlocale +.if ${MACHINE_CPUARCH} == "amd64" +SUBDIR+= i386 +.endif SUBDIR_PARALLEL= INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ db.h \ @@ -338,6 +341,10 @@ compat: mtree -deU ${NO_ROOT:D-W} ${MTREE_FOLLOWS_SYMLINKS} \ -f ${SRCTOP}/etc/mtree/BSD.include.dist \ -p ${SDESTDIR}${INCLUDEDIR} > /dev/null +.if ${MACHINE_CPUARCH} == "amd64" + ${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${SDESTDIR}${INCLUDEDIR}/i386 +.endif copies: .PHONY .META cd ${SDESTDIR}${INCLUDEDIR}; find ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto \ diff --git a/include/i386/Makefile b/include/i386/Makefile new file mode 100644 index 000000000000..60f70d4756b2 --- /dev/null +++ b/include/i386/Makefile @@ -0,0 +1,7 @@ +# i386 headers installed on amd64 + +.PATH: ${SRCTOP}/sys/i386/include +INCS= +INCSDIR= ${INCLUDEDIR}/i386 + +.include