From nobody Wed Mar 22 16:32:52 2023 X-Original-To: dev-commits-src-branches@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 4PhYtF094tz412Yn; Wed, 22 Mar 2023 16:32:53 +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 4PhYtD4pgsz3QTg; Wed, 22 Mar 2023 16:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502772; 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=h6VS4H6xw9lFotGLfFl56/mijmYery7I7ytQCVVsAO8=; b=upUAdBQ9wvIa6M/93y1RlfsNBSBkn0x6nMjSnhpjhOghcLNLcPDe1t2uqMSARapHinjokD xTZ6wAtsZzreG5GbavXHFnbx0XcKM7i7tZku9MZE7oOrSGJr93QcpEyRR58Rhp/nDnx+br /xOfxKp/UC9fXlZAGcmQyNo3V0rc6WcE6KEGYBH8JIpDGfi0EtYQvpPgYto/IDTHa0j2u+ nj2A4iID/Vg6Meq5BkGXsloI8l0UsKbri9q/UBkXwLZ0PF0a0/3xZOFRfgtLsj3goDTfM7 SBAh1MPbBX9u61nqJlLL16XlFS+28WGONewbOlgzRwgN6QXCqbovbkdbsvASCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502772; 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=h6VS4H6xw9lFotGLfFl56/mijmYery7I7ytQCVVsAO8=; b=I86oacWU8RRnZj4vbxbbqIBFJ+efJx4iBeOQuJ8vi7dF2CH167b6VMM4r/+unMFxHeCUBW 4t0LWTITPmn1GDQU572y4mY2iNBkq5UrrZhtL95DJ7eYtgZoo4msdu2i5O+Qxk1Qs3TERa MPCnYsC7A7bMEBGiK05UfWoe/vbuJmCVvR8eXiYyl38PfN0BN9t/I7oDUD4ZBYCs4+yqqt OJXl1TD8KOdq1hFie+YXZBB83++sDLbmw2zFjos2103ZruWj4ePCvt7YO1Lz7Q330TPPoA TUEaPPxo7jE3tW5fBU8GUKPMZEA8CZQw2SlornyHZkjpkr6lJ+mVsAub8Q+dZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502772; a=rsa-sha256; cv=none; b=yivxN2uwHVVtmYJFFyJ4PpHEzcKHmgJAXiORzaDuqxi1ohydNRh8aWGU28mfcI6uRbFiN/ DWBShgFJtqW/ZD+UkTPFejbM9XotJrYzPrO4Zxt/f5gaUGkZU3lH3K1aSyYAdarGzkfpir 3JnmS1uWu0jKVc6EDRmt74u255T2yPmwDtHHjaK77Vv4IpgSgoCWkLrmkQwUBq6jZyhbeC veWazx32U3u7jk648Rw+RcKkrHnkBAs/a3pKH+QDFo/8QqBTeP09Mg7SkVXfvTwcxN7TeN kn+mghm+EpZemDRzmhK5i+E3Zu2q9HeH8nXwnUUZ4LV7bMzL8gjaBmKBUIk40w== 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 4PhYtD3hFcz11X2; Wed, 22 Mar 2023 16:32:52 +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 32MGWqqq024024; Wed, 22 Mar 2023 16:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWqco024023; Wed, 22 Mar 2023 16:32:52 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:52 GMT Message-Id: <202303221632.32MGWqco024023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 3eb107dd5913 - stable/13 - Remove the MK_LIBCPLUSPLUS option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3eb107dd5913f1e114b1fc2a2ef702010cb99151 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3eb107dd5913f1e114b1fc2a2ef702010cb99151 commit 3eb107dd5913f1e114b1fc2a2ef702010cb99151 Author: Alex Richardson AuthorDate: 2021-01-30 17:56:35 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:22:07 +0000 Remove the MK_LIBCPLUSPLUS option This option has been equivalent to any form of C++ support since libstdc++ was removed. Therefore, replace all MK_LIBCPLUSPLUS uses with MK_CXX. Reviewed By: emaste Differential Revision: https://reviews.freebsd.org/D27974 (cherry picked from commit 5cf6f1c4bc281ac45ced086bc2e393f732f2fcc2) --- Makefile.inc1 | 8 ++++---- lib/Makefile | 2 +- lib/libproc/Makefile | 4 +--- share/man/man5/src.conf.5 | 2 -- share/mk/bsd.libnames.mk | 1 - share/mk/bsd.prog.mk | 4 ---- share/mk/src.libnames.mk | 4 ---- share/mk/src.opts.mk | 1 - tools/build/mk/OptionalObsoleteFiles.inc | 2 +- tools/build/options/WITHOUT_LIBCPLUSPLUS | 2 -- tools/build/options/WITH_LIBCPLUSPLUS | 2 -- 11 files changed, 7 insertions(+), 25 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 86f59040ac1d..23719eae7d0f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2912,7 +2912,7 @@ _prereq_libs+= lib/libssp_nonshared _startup_libs= lib/csu _startup_libs+= lib/libc _startup_libs+= lib/libc_nonshared -.if ${MK_LIBCPLUSPLUS} != "no" +.if ${MK_CXX} != "no" _startup_libs+= lib/libcxxrt .endif @@ -2921,7 +2921,7 @@ _startup_libs+= lib/libgcc_eh lib/libgcc_s lib/libgcc_s__L: lib/libc__L lib/libgcc_s__L: lib/libc_nonshared__L -.if ${MK_LIBCPLUSPLUS} != "no" +.if ${MK_CXX} != "no" lib/libcxxrt__L: lib/libgcc_s__L .endif @@ -2970,7 +2970,7 @@ gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncurses__L _prebuild_libs+= lib/libregex .endif -.if ${MK_LIBCPLUSPLUS} != "no" +.if ${MK_CXX} != "no" _prebuild_libs+= lib/libc++ .endif @@ -3136,7 +3136,7 @@ lib/libradius__L: lib/libmd__L lib/libproc__L: \ ${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L lib/librtld_db__L lib/libutil__L -.if ${MK_CXX} != "no" && ${MK_LIBCPLUSPLUS} != "no" +.if ${MK_CXX} != "no" lib/libproc__L: lib/libcxxrt__L .endif diff --git a/lib/Makefile b/lib/Makefile index 091bbc2a4ca8..cdebb4cea86b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -184,7 +184,7 @@ SUBDIR.${MK_STATS}+= libstats _libclang_rt= libclang_rt .endif -.if ${MK_LIBCPLUSPLUS} != "no" +.if ${MK_CXX} != "no" _libcxxrt= libcxxrt _libcplusplus= libc++ _libcplusplus+= libc++experimental diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index 7fe6dd958ebd..37d550cb22e3 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -17,10 +17,8 @@ CFLAGS+= -I${.CURDIR} .if ${MK_CXX} == "no" CFLAGS+= -DNO_CXA_DEMANGLE -.elif ${MK_LIBCPLUSPLUS} != "no" -LIBADD+= cxxrt .else -LIBADD+= supcplusplus +LIBADD+= cxxrt .endif LIBADD+= elf procstat rtld_db util z diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index b7ea2be546ab..7609a6fbbe56 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -880,8 +880,6 @@ runtime linker. .Pp This is a default setting on arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mips, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. -.It Va WITHOUT_LIBCPLUSPLUS -Set to avoid building libcxxrt and libc++. .It Va WITH_LIBSOFT On armv6 only, enable soft float ABI compatibility libraries. This option is for transitioning to the new hard float ABI. diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 499bdeb66805..1342c09d190b 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -144,7 +144,6 @@ LIBSPL?= ${LIBDESTDIR}${LIBDIR_BASE}/libspl.a LIBSSL?= ${LIBDESTDIR}${LIBDIR_BASE}/libssl.a LIBSSP_NONSHARED?= ${LIBDESTDIR}${LIBDIR_BASE}/libssp_nonshared.a LIBSTATS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstats.a -LIBSTDCPLUSPLUS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstdc++.a LIBSTDTHREADS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstdthreads.a LIBSYSDECODE?= ${LIBDESTDIR}${LIBDIR_BASE}/libsysdecode.a LIBTACPLUS?= ${LIBDESTDIR}${LIBDIR_BASE}/libtacplus.a diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 78fc920ec337..a55c2fd103fd 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -266,11 +266,7 @@ _EXTRADEPEND: .else echo ${PROG_FULL}: ${LIBC} ${DPADD} >> ${DEPENDFILE} .if defined(PROG_CXX) -.if ${COMPILER_TYPE} == "clang" && empty(CXXFLAGS:M-stdlib=libstdc++) echo ${PROG_FULL}: ${LIBCPLUSPLUS} >> ${DEPENDFILE} -.else - echo ${PROG_FULL}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE} -.endif .endif .endif .endif # !defined(NO_EXTRADEPEND) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index d74926c7aca7..bf3eb1d3e970 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -323,11 +323,7 @@ _DP_radius= crypto _DP_rtld_db= elf procstat _DP_procstat= kvm util elf .if ${MK_CXX} == "yes" -.if ${MK_LIBCPLUSPLUS} != "no" _DP_proc= cxxrt -.else -_DP_proc= supcplusplus -.endif .endif .if ${MK_CDDL} != "no" _DP_proc+= ctf diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 76185a2bca49..403bbfb1a138 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -125,7 +125,6 @@ __DEFAULT_YES_OPTIONS = \ LDNS \ LDNS_UTILS \ LEGACY_CONSOLE \ - LIBCPLUSPLUS \ LLD \ LLD_BOOTSTRAP \ LLD_IS_LD \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c3febff5800e..81ab89eff94f 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3665,7 +3665,7 @@ OLD_LIBS+=${DEBUG_LIB32_LIBS} . endif .endif -.if ${MK_LIBCPLUSPLUS} == no +.if ${MK_CXX} == no OLD_LIBS+=lib/libcxxrt.so.1 OLD_FILES+=usr/lib/libc++.a OLD_FILES+=usr/lib/libc++_p.a diff --git a/tools/build/options/WITHOUT_LIBCPLUSPLUS b/tools/build/options/WITHOUT_LIBCPLUSPLUS deleted file mode 100644 index 2449e30d4b10..000000000000 --- a/tools/build/options/WITHOUT_LIBCPLUSPLUS +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Set to avoid building libcxxrt and libc++. diff --git a/tools/build/options/WITH_LIBCPLUSPLUS b/tools/build/options/WITH_LIBCPLUSPLUS deleted file mode 100644 index 0f30dd8c1e4f..000000000000 --- a/tools/build/options/WITH_LIBCPLUSPLUS +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Set to build libcxxrt and libc++.